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.
ostreedev · Aug 24, 2023 · d2d1602 · d2d1602
1 parent fb06d59
commit d2d1602
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composefs b/composefs
diff --git 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
     }