Enable composefs for 41+

We really want to aim to eventually enable this by default, let's test things out in rawhide. A thing that this is known to break is the "chattr -i" hack for new toplevel dirs (xref coreos/rpm-ostree#337 ) Basically if you want that, you either need to make a derived image, or enable transient root.
cgwalters · Feb 15, 2024 · b9175f2 · b9175f2
1 parent 68b7cbd
commit b9175f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/manifests/composefs.yaml b/manifests/composefs.yaml
@@ -0,0 +1,3 @@
+# Enable composefs by default.
+ostree-layers:
+  - overlay/08composefs
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
@@ -33,6 +33,9 @@ conditional-include:
     # Remove this once we have Podman v5 in f39.
     # xref: https://github.com/coreos/fedora-coreos-tracker/issues/1629
     include: cni-plugins.yaml
+  - if:
+      - releasever >= 41
+    include: composefs.yaml
 
 ostree-layers:
   - overlay/15fcos

diff --git a/overlay.d/08composefs/README.md b/overlay.d/08composefs/README.md
@@ -0,0 +1,2 @@
+Enable composefs by default; more in https://ostreedev.github.io/ostree/composefs/
+For now rawhide only.
diff --git a/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf b/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf
@@ -0,0 +1,2 @@
+[composefs]
+enabled = true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Enable composefs by default; more in https://ostreedev.github.io/ostree/composefs/
		For now rawhide only.