From dd33cc65e03efa19d083068e01521ea3330edc79 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 3 Jan 2024 13:05:15 -0500 Subject: [PATCH] switchroot: use shared constant for unlock --hotfix So it's easier to link the two bits of code. --- src/libotcore/otcore.h | 3 +++ src/switchroot/ostree-prepare-root.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libotcore/otcore.h b/src/libotcore/otcore.h index 4d51398e6a..1fe4be015e 100644 --- a/src/libotcore/otcore.h +++ b/src/libotcore/otcore.h @@ -60,6 +60,9 @@ GKeyFile *otcore_load_config (int rootfs, const char *filename, GError **error); // The directory holding the root overlayfs #define OSTREE_DEPLOYMENT_ROOT_TRANSIENT_DIR "root-transient" +// Written by ostree admin unlock --hotfix, read by ostree-prepare-root +#define OTCORE_HOTFIX_USR_OVL_WORK ".usr-ovl-work" + // The name of the composefs metadata root #define OSTREE_COMPOSEFS_NAME ".ostree.cfs" // The temporary directory used for the EROFS mount; it's in the .private directory diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index 1a0539e190..5f4d213286 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -632,12 +632,17 @@ main (int argc, char *argv[]) } /* Prepare /usr. - * It may be either just a read-only bind-mount, or a persistent overlayfs. */ - if (lstat (".usr-ovl-work", &stbuf) == 0) + * It may be either just a read-only bind-mount, or a persistent overlayfs if set up + * with ostree admin unlock --hotfix. + * Note however that root.transient as handled above is effectively a generalization of unlock + * --hotfix. + */ + if (lstat (OTCORE_HOTFIX_USR_OVL_WORK, &stbuf) == 0) { /* Do we have a persistent overlayfs for /usr? If so, mount it now. */ const char usr_ovl_options[] - = "lowerdir=" TMP_SYSROOT "/usr,upperdir=.usr-ovl-upper,workdir=.usr-ovl-work"; + = "lowerdir=" TMP_SYSROOT + "/usr,upperdir=.usr-ovl-upper,workdir=" OTCORE_HOTFIX_USR_OVL_WORK; /* Except overlayfs barfs if we try to mount it on a read-only * filesystem. For this use case I think admins are going to be