From bda5a48761b389673604ea7d5d7fb78dbeb94b00 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jan 09 2025 15:40:29 +0000
Subject: [PATCH 1/2] ci/validate: Ignore correctly indented lines starting with [


---

diff --git a/ci/validate b/ci/validate
index a72462c..8660ee1 100755
--- a/ci/validate
+++ b/ci/validate
@@ -33,7 +33,7 @@ for root, dirs, files, rootfd in os.fwalk('.'):
             print("Validating:", name)
             with open(os.open(name, dir_fd=rootfd, flags=os.O_RDONLY)) as f:
                 yaml.safe_load(f)
-            result = subprocess.run(['grep', '-RniEv', '^(  )*[a-z#/-]|^$|^#', name], encoding='UTF-8',
+            result = subprocess.run(['grep', '-RniEv', '^(  )*[a-z#/-]|^(  )*\\[|^$|^#', name], encoding='UTF-8',
                                     preexec_fn=lambda: os.fchdir(rootfd))
             if result.returncode == 0:
                 raise Exception("Found likely invalid indentation in YAML file: {}".format(name))

From 16bdb097fbda0e5ecc0dd19156b780e8f2f58d1b Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jan 09 2025 15:40:29 +0000
Subject: [PATCH 2/2] composefs: Force disable composefs


Starting with ostree 2024.10, composefs is now enabled by default.
Enabling composefs is not ready in F40 so force disable it.

See: https://github.com/ostreedev/ostree/pull/3353
See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops

---

diff --git a/composefs.yaml b/composefs.yaml
new file mode 100644
index 0000000..8de0fb3
--- /dev/null
+++ b/composefs.yaml
@@ -0,0 +1,12 @@
+# Force disable composefs
+# See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops
+postprocess:
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+
+    install -dm 0755 -o 0 -g 0 /usr/lib/ostree
+    cat >> /usr/lib/ostree/prepare-root.conf << 'EOF'
+    [composefs]
+    enabled = no
+    EOF
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index dbe6926..dc82605 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -8,6 +8,7 @@ container-cmd:
 
 include:
   - fedora-common-ostree-pkgs.yaml
+  - composefs.yaml
 
 packages:
   # Ensure that we have a kernel. Kernel packages are not in any comps group