From 1b9c0982175906941bbb8253dbcfa95b29a88905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Mon, 26 Aug 2024 11:32:47 +0200
Subject: [PATCH] Revert "Bootable Containers: Enable composefs by default"

See: https://gitlab.com/fedora/ostree/sig/-/issues/35

This reverts commit 20d815873585502c920ad421dd70229967c8400b.
---
 common.yaml    |  1 -
 composefs.yaml | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 composefs.yaml

diff --git a/common.yaml b/common.yaml
index cfbe047..b16245b 100644
--- a/common.yaml
+++ b/common.yaml
@@ -32,7 +32,6 @@ conditional-include:
   # Manifests included only for the Bootable Container variants
   - if: bootable_container == true
     include:
-      - composefs.yaml
       - bootc.yaml
       - dnf5.yaml
 
diff --git a/composefs.yaml b/composefs.yaml
deleted file mode 100644
index f2e3e0d..0000000
--- a/composefs.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set up composefs by default
-# See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
-postprocess:
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-
-    cat >> /usr/lib/ostree/prepare-root.conf << 'EOF'
-    [composefs]
-    enabled = yes
-    EOF