diff options
Diffstat (limited to 'src/libostree')
-rw-r--r-- | src/libostree/ostree-sysroot.c | 6 | ||||
-rw-r--r-- | src/libostree/ostree-sysroot.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index eccf9375..9cb40e66 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -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); @@ -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); } } diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h index 41361716..c240aaa0 100644 --- a/src/libostree/ostree-sysroot.h +++ b/src/libostree/ostree-sysroot.h @@ -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)) |