shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-21 22:04:15 +03:00
Code Issues Projects Releases Wiki Activity

prepare-root: If composefs is configured as "maybe" don't fail

Browse Source 
If composefs is configured as "maybe", we should continue even if
composefs support is not built in.
This commit is contained in:
Eric Curtin 2023-08-24 15:20:25 +01:00
parent fb06d59e75
commit 29423a893c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switchroot/ostree-prepare-root.c
View File

@ -424,11 +424,11 @@ main (int argc, char *argv[])
// Tracks if we did successfully enable it at runtime
bool using_composefs = false;
#ifdef HAVE_COMPOSEFS
/* We construct the new sysroot in /sysroot.tmp, which is either the composfs
mount or a bind mount of the deploy-dir */
if (composefs_config->enabled != OT_TRISTATE_NO)
{
#ifdef HAVE_COMPOSEFS
const char *objdirs[] = { "/sysroot/ostree/repo/objects" };
g_autofree char *cfs_digest = NULL;
struct lcfs_mount_options_s cfs_options = {
@ -532,10 +532,12 @@ main (int argc, char *argv[])
errx (EXIT_FAILURE, "composefs: failed to mount: %s", errmsg);
}
}
#else
errx (EXIT_FAILURE, "composefs: enabled at runtime, but support is not compiled in");
#endif
}
#else
/* if composefs is configured as "maybe", we should continue */
if (composefs_config->enabled == OT_TRISTATE_YES)
errx (EXIT_FAILURE, "composefs: enabled at runtime, but support is not compiled in");
#endif
if (!using_composefs)
{