Enable composefs for 41+

cgwalters · jbtrystram · commit b0b27dcf17cc · 2024-07-17T08:57:07.000+02:00
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.
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
@@ -30,6 +30,8 @@ conditional-include:
   # Wifi firmwares will be dropped in F41
   - if: releasever < 41
     include: wifi-firmwares.yaml
+  - if: stream == "rawhide"
+    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,3 @@`
	`1`	`+# Enable composefs by default.`
	`2`	`+ostree-layers:`
	`3`	`+ - overlay/08composefs`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Enable composefs by default; more in https://ostreedev.github.io/ostree/composefs/`
	`2`	`+For now rawhide only.`