From 55abda7e3e293fb0a79e973c912fef0441b01e80 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 15 Feb 2024 13:21:46 -0500 Subject: [PATCH] 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 https://github.com/coreos/rpm-ostree/issues/337 ) Basically if you want that, you either need to make a derived image, or enable transient root. --- manifests/composefs.yaml | 3 +++ manifests/fedora-coreos.yaml | 2 ++ overlay.d/08composefs/README.md | 2 ++ overlay.d/08composefs/usr/lib/ostree/prepare-root.conf | 2 ++ 4 files changed, 9 insertions(+) create mode 100644 manifests/composefs.yaml create mode 100644 overlay.d/08composefs/README.md create mode 100644 overlay.d/08composefs/usr/lib/ostree/prepare-root.conf diff --git a/manifests/composefs.yaml b/manifests/composefs.yaml new file mode 100644 index 0000000000..d575c1349b --- /dev/null +++ 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 index edd8679cb9..78e8ae6222 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -33,6 +33,8 @@ 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: stream == "rawhide" + include: composefs.yaml ostree-layers: - overlay/15fcos diff --git a/overlay.d/08composefs/README.md b/overlay.d/08composefs/README.md new file mode 100644 index 0000000000..487f8be8f4 --- /dev/null +++ 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 new file mode 100644 index 0000000000..2faae22bc9 --- /dev/null +++ b/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf @@ -0,0 +1,2 @@ +[composefs] +enabled = true