Skip to content

Commit

Permalink
sysroot: Add a public #define OSTREE_PATH_BOOTED
Browse files Browse the repository at this point in the history
  • Loading branch information
cgwalters committed Jan 12, 2022
1 parent 998154f commit 0ff4bee
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/libostree/ostree-sysroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ ostree_sysroot_initialize (OstreeSysroot *self,
* we'll use it to sanity check that we found a booted deployment for example.
* Second, we also find out whether sysroot == /.
*/
if (!glnx_fstatat_allow_noent (AT_FDCWD, "/run/ostree-booted", NULL, 0, error))
if (!glnx_fstatat_allow_noent (AT_FDCWD, OSTREE_PATH_BOOTED, NULL, 0, error))
return FALSE;
const gboolean ostree_booted = (errno == 0);

Expand Down Expand Up @@ -1106,11 +1106,11 @@ sysroot_load_from_bootloader_configs (OstreeSysroot *self,
return FALSE;
if (errno == ENOENT)
{
return glnx_throw (error, "Unexpected state: /run/ostree-booted found, but no /boot/loader directory");
return glnx_throw (error, "Unexpected state: %s found, but no /boot/loader directory", OSTREE_PATH_BOOTED);
}
else
{
return glnx_throw (error, "Unexpected state: /run/ostree-booted found and in / sysroot, but bootloader entry not found");
return glnx_throw (error, "Unexpected state: %s found and in / sysroot, but bootloader entry not found", OSTREE_PATH_BOOTED);
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/libostree/ostree-sysroot.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@

G_BEGIN_DECLS

/**
* OSTREE_PATH_BOOTED:
* Filesystem path that is created on an ostree-booted system.
*
* Since: 2022.2
*/
#define OSTREE_PATH_BOOTED "/run/ostree-booted"

#define OSTREE_TYPE_SYSROOT ostree_sysroot_get_type()
#define OSTREE_SYSROOT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), OSTREE_TYPE_SYSROOT, OstreeSysroot))
Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-admin-builtin-finalize-staged.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ot_admin_builtin_finalize_staged (int argc, char **argv, OstreeCommandInvocation
/* Just a sanity check; we shouldn't be called outside of the service though.
*/
struct stat stbuf;
if (fstatat (AT_FDCWD, "/run/ostree-booted", &stbuf, 0) < 0)
if (fstatat (AT_FDCWD, OSTREE_PATH_BOOTED, &stbuf, 0) < 0)
return TRUE;

g_autoptr(GOptionContext) context = g_option_context_new ("");
Expand Down
2 changes: 1 addition & 1 deletion src/ostree/ot-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ maybe_setup_mount_namespace (gboolean *out_ns,
return TRUE;

/* If the system isn't booted via libostree, also nothing to do */
if (!glnx_fstatat_allow_noent (AT_FDCWD, "/run/ostree-booted", NULL, 0, error))
if (!glnx_fstatat_allow_noent (AT_FDCWD, OSTREE_PATH_BOOTED, NULL, 0, error))
return FALSE;
if (errno == ENOENT)
return TRUE;
Expand Down

0 comments on commit 0ff4bee

Please sign in to comment.