From 0bf8cbe8ea3ea4e1d56bf2cf0f0e97b02b100799 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 15 Feb 2024 13:21:46 -0500 Subject: [PATCH 1/2] 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 0be3297d23..ab36825bfe 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -46,6 +46,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 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 From ac8c6193acbe800a1630505d3344558e2aaf1593 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Wed, 10 Jul 2024 17:28:49 +0200 Subject: [PATCH 2/2] overlay/composeFS: try shipping kdump fix See https://issues.redhat.com/browse/RHEL-35885 --- .../etc/systemd/system/kdump.service.d/override.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 overlay.d/08composefs/etc/systemd/system/kdump.service.d/override.conf diff --git a/overlay.d/08composefs/etc/systemd/system/kdump.service.d/override.conf b/overlay.d/08composefs/etc/systemd/system/kdump.service.d/override.conf new file mode 100644 index 0000000000..c46db5357c --- /dev/null +++ b/overlay.d/08composefs/etc/systemd/system/kdump.service.d/override.conf @@ -0,0 +1,2 @@ +[Service] +PrivateTmp=no