From: Eric Curtin <ecurtin@redhat.com>
Date: Thu, 24 Aug 2023 14:20:25 +0000 (+0100)
Subject: prepare-root: If composefs is configured as "maybe" don't fail
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~4^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29423a893c2a179eb7f64afd9800a474cda71d5a;p=ostree.git

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.
---

diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
index 62ea5617..54a55c1d 100644
--- a/src/switchroot/ostree-prepare-root.c
+++ b/src/switchroot/ostree-prepare-root.c
@@ -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");
+  /* 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)
     {