From e52c04a3c3c8907dd6071207a673bd2b86882acf Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 24 May 2023 23:11:35 -0400 Subject: [PATCH] manifests: enable OSTree autopruning for ppc64le The ppc64le arch has been blocked [1] from being fully released because of size limitations in /boot not being able to hold 3 copies of kernel+initramfs because the kernel on ppc64le isn't compressed [2]. Now that OSTree Autopruning [3] has landed let's enable it on ppc64le to unblock ourselves. [1] https://github.com/coreos/fedora-coreos-tracker/issues/987#issuecomment-1281123396 [2] https://github.com/coreos/fedora-coreos-tracker/issues/1247#issuecomment-1355314761 [3] https://github.com/coreos/fedora-coreos-tracker/issues/1495 --- manifests/fedora-coreos.yaml | 6 ++++++ manifests/ostree-autoprune.yaml | 11 +++++++++++ 2 files changed, 17 insertions(+) create mode 100644 manifests/ostree-autoprune.yaml diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index 0af4eb6bf2..40c8e0ea91 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -23,6 +23,12 @@ 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 ostree-layers: - overlay/15fcos diff --git a/manifests/ostree-autoprune.yaml b/manifests/ostree-autoprune.yaml new file mode 100644 index 0000000000..44f3b4d370 --- /dev/null +++ b/manifests/ostree-autoprune.yaml @@ -0,0 +1,11 @@ +# 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