From d2d16023b6fcf58b75a9701262bd18c04c82ffbc Mon Sep 17 00:00:00 2001 From: Eric Curtin Date: Thu, 24 Aug 2023 14:12:13 +0100 Subject: [PATCH] prepare-root: If composefs is configured as "maybe" don't fail If composefs is configured as "maybe", we should continue even if composefs support is not built in. --- composefs | 1 - src/switchroot/ostree-prepare-root.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 160000 composefs diff --git a/composefs b/composefs deleted file mode 160000 index 1aed8781d6..0000000000 --- a/composefs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1aed8781d6ce617234175d5d3b0458f91a6e38f3 diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index 62ea56171b..99c48778ae 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -533,7 +533,9 @@ main (int argc, char *argv[]) } } #else - errx (EXIT_FAILURE, "composefs: enabled at runtime, but support is not compiled in"); + /* 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 }