packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/sysroot: Maintain one variable for "root is ostree booted" 

This was pointed out in a previous PR review; we don't have
a need for the separate variables.  Prep for adding an API for
this.

Closes: #1568
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-05-01 20:29:55 +00:00 committed by Atomic Bot
parent 36ac768fb7
commit f5f8e2c540
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-sysroot-private.h
View File

@ -50,8 +50,7 @@ struct OstreeSysroot {
GLnxLockFile lock; GLnxLockFile lock;
gboolean loaded; gboolean loaded;
gboolean ostree_booted; gboolean root_is_ostree_booted; /* TRUE if sysroot is / and we are booted via ostree */
gboolean root_is_sysroot; /* TRUE if sysroot_fd is pointed to rootfs "/" */
/* The device/inode for /, used to detect booted deployment */ /* The device/inode for /, used to detect booted deployment */
dev_t root_device; dev_t root_device;
ino_t root_inode; ino_t root_inode;

18
src/libostree/ostree-sysroot.c
View File

@ -636,10 +636,8 @@ parse_deployment (OstreeSysroot *self,
return FALSE; return FALSE;
/* See if this is the booted deployment */ /* See if this is the booted deployment */
const gboolean root_is_ostree_booted =
(self->ostree_booted && self->root_is_sysroot);
const gboolean looking_for_booted_deployment = const gboolean looking_for_booted_deployment =
(root_is_ostree_booted && !self->booted_deployment); (self->root_is_ostree_booted && !self->booted_deployment);
gboolean is_booted_deployment = FALSE; gboolean is_booted_deployment = FALSE;
if (looking_for_booted_deployment) if (looking_for_booted_deployment)
{ {
@ -802,9 +800,7 @@ _ostree_sysroot_reload_staged (OstreeSysroot *self,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Loading staged deployment", error); GLNX_AUTO_PREFIX_ERROR ("Loading staged deployment", error);
const gboolean root_is_ostree_booted = if (!self->root_is_ostree_booted)
self->ostree_booted && self->root_is_sysroot;
if (!root_is_ostree_booted)
return TRUE; /* Note early return */ return TRUE; /* Note early return */
g_assert (self->booted_deployment); g_assert (self->booted_deployment);
@ -879,7 +875,7 @@ ostree_sysroot_load_if_changed (OstreeSysroot *self,
{ {
if (!glnx_fstatat_allow_noent (AT_FDCWD, "/run/ostree-booted", NULL, 0, error)) if (!glnx_fstatat_allow_noent (AT_FDCWD, "/run/ostree-booted", NULL, 0, error))
return FALSE; return FALSE;
self->ostree_booted = (errno == 0); const gboolean ostree_booted = (errno == 0);
{ struct stat root_stbuf; { struct stat root_stbuf;
if (!glnx_fstatat (AT_FDCWD, "/", &root_stbuf, 0, error)) if (!glnx_fstatat (AT_FDCWD, "/", &root_stbuf, 0, error))
@ -892,9 +888,11 @@ ostree_sysroot_load_if_changed (OstreeSysroot *self,
if (!glnx_fstat (self->sysroot_fd, &self_stbuf, error)) if (!glnx_fstat (self->sysroot_fd, &self_stbuf, error))
return FALSE; return FALSE;
self->root_is_sysroot = const gboolean root_is_sysroot =
(self->root_device == self_stbuf.st_dev && (self->root_device == self_stbuf.st_dev &&
self->root_inode == self_stbuf.st_ino); self->root_inode == self_stbuf.st_ino);
self->root_is_ostree_booted = (ostree_booted && root_is_sysroot);
} }
int bootversion = 0; int bootversion = 0;
@ -947,9 +945,7 @@ ostree_sysroot_load_if_changed (OstreeSysroot *self,
} }
} }
const gboolean root_is_ostree_booted = if (self->root_is_ostree_booted && !self->booted_deployment)
self->ostree_booted && self->root_is_sysroot;
if (root_is_ostree_booted && !self->booted_deployment)
return glnx_throw (error, "Unexpected state: /run/ostree-booted found and in / sysroot but not in a booted deployment"); return glnx_throw (error, "Unexpected state: /run/ostree-booted found and in / sysroot but not in a booted deployment");
if (!_ostree_sysroot_reload_staged (self, error)) if (!_ostree_sysroot_reload_staged (self, error))