From 6feaf8eff98a5d887cc76be3aae2d55a3c4acaac Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 23 Oct 2023 16:58:46 -0400 Subject: [PATCH] manifest: Enable ostree bootloader-naming-2 for f40 - This removes the autoprune stuff which is already always on in ostree now - Add the new "experiment" of bootloader-naming-2; xref https://github.com/ostreedev/ostree/pull/3007 --- manifests/fedora-coreos.yaml | 14 ++------------ manifests/ostree-autoprune.yaml | 11 ----------- manifests/ostree-bls.yaml | 10 ++++++++++ 3 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 manifests/ostree-autoprune.yaml create mode 100644 manifests/ostree-bls.yaml diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index 2115a986d1..77be73f3f1 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -23,19 +23,9 @@ conditional-include: - if: basearch != "s390x" # And remove some cruft from grub2 include: grub2-removals.yaml - - if: basearch == "ppc64le" - # Need OSTree autopruning on ppc64le (because kernels aren't compressed) - # until we increase the size of /boot. - # https://github.com/coreos/fedora-coreos-tracker/issues/1247#issuecomment-1355314761 - # https://github.com/coreos/fedora-coreos-tracker/issues/1495#issuecomment-1561765705 - include: ostree-autoprune.yaml - if: - - basearch == "aarch64" - - releasever >= 39 - # In F39+ we will stop removing the qcom dtb files and thus we'll leverage OSTree autopruning - # so that we don't run into https://github.com/coreos/fedora-coreos-tracker/issues/1464 - # again. OSTree autopruning is new so we're selectively enabling it before making it the default. - include: ostree-autoprune.yaml + - releasever >= 40 + include: ostree-bls.yaml - if: - basearch == "aarch64" - releasever == 38 diff --git a/manifests/ostree-autoprune.yaml b/manifests/ostree-autoprune.yaml deleted file mode 100644 index 44f3b4d370..0000000000 --- a/manifests/ostree-autoprune.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Enable OSTree autopruning to help with /boot size constraints -# https://github.com/coreos/fedora-coreos-tracker/issues/1495 -postprocess: - - | - #!/usr/bin/env bash - mkdir -p /usr/lib/systemd/system/ostree-finalize-staged.service.d - cat <<'EOF' > /usr/lib/systemd/system/ostree-finalize-staged.service.d/ostree-autoprune.conf - [Service] - # https://github.com/coreos/fedora-coreos-tracker/issues/1495 - Environment=OSTREE_SYSROOT_OPTS=early-prune - EOF diff --git a/manifests/ostree-bls.yaml b/manifests/ostree-bls.yaml new file mode 100644 index 0000000000..5d99cf7316 --- /dev/null +++ b/manifests/ostree-bls.yaml @@ -0,0 +1,10 @@ +# Enable fixed OSTree grub2 naming +# https://github.com/ostreedev/ostree/pull/3007 +postprocess: + - | + #!/usr/bin/env bash + mkdir -p /usr/lib/systemd/system/ostree-finalize-staged.service.d + cat <<'EOF' > /usr/lib/systemd/system/ostree-finalize-staged.service.d/ostree-bls-naming.conf + [Service] + Environment=OSTREE_SYSROOT_OPTS=bootloader-naming-2 + EOF