diff --git a/0005-data-profile.d-almalinux-Add-Btrfs-support.patch b/0005-data-profile.d-almalinux-Add-Btrfs-support.patch new file mode 100644 index 0000000..751260a --- /dev/null +++ b/0005-data-profile.d-almalinux-Add-Btrfs-support.patch @@ -0,0 +1,35 @@ +From 5d2bd35eade079c5406c601b371b827729bfd3fe Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Fri, 30 May 2025 14:27:12 -0400 +Subject: [PATCH 5/5] data/profile.d/almalinux: Add Btrfs support + +As part of enabling Btrfs support, set reasonable defaults for +Btrfs compression similar to Fedora Linux and CentOS Hyperscale +and allow it to be part of the payload of requested packages to +be installed so that installs with Btrfs are not broken out of the box. +--- + data/profile.d/almalinux.conf | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/data/profile.d/almalinux.conf b/data/profile.d/almalinux.conf +index b40c556adc..d45d682391 100644 +--- a/data/profile.d/almalinux.conf ++++ b/data/profile.d/almalinux.conf +@@ -16,7 +16,14 @@ forbidden_modules = + [Bootloader] + efi_dir = almalinux + ++[Storage] ++btrfs_compression = zstd:1 ++ + [Payload] ++# RHEL removes btrfs-progs, but we want it back ++ignored_packages = ++ ntfsprogs ++ + enable_closest_mirror = True + default_source = CLOSEST_MIRROR + +-- +2.49.0 + diff --git a/0005-data-profile.d-almalinux-Restore-btrfs-progs-to-the-.patch b/0005-data-profile.d-almalinux-Restore-btrfs-progs-to-the-.patch deleted file mode 100644 index f8f6ae5..0000000 --- a/0005-data-profile.d-almalinux-Restore-btrfs-progs-to-the-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 67da322d724f6cb075479264a615ccd728e33bc9 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Mon, 26 May 2025 20:43:19 -0400 -Subject: [PATCH 5/5] data/profile.d/almalinux: Restore btrfs-progs to the - payload - -As part of enabling Btrfs support, allow it to be part of the -payload of requested packages to be installed so that installs -with Btrfs are not broken out of the box. ---- - data/profile.d/almalinux.conf | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/data/profile.d/almalinux.conf b/data/profile.d/almalinux.conf -index b40c556adc..f98d95c416 100644 ---- a/data/profile.d/almalinux.conf -+++ b/data/profile.d/almalinux.conf -@@ -17,6 +17,10 @@ forbidden_modules = - efi_dir = almalinux - - [Payload] -+# RHEL removes btrfs-progs, but we want it back -+ignored_packages = -+ ntfsprogs -+ - enable_closest_mirror = True - default_source = CLOSEST_MIRROR - --- -2.49.0 - diff --git a/anaconda.spec b/anaconda.spec index 8be6c53..d1b8fba 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 40.22.3.30 -Release: 1%{?dist}.alma.2 +Release: 1%{?dist}.alma.3 License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -17,7 +17,7 @@ Patch1001: 0001-Add-Minimal-repo-support.patch Patch1002: 0002-Change-anaconda-background-color.patch Patch1003: 0003-Remove-visible-Fedora-references.patch Patch1004: 0004-Revert-storage-Remove-support-for-the-btrfs-command-.patch -Patch1005: 0005-data-profile.d-almalinux-Restore-btrfs-progs-to-the-.patch +Patch1005: 0005-data-profile.d-almalinux-Add-Btrfs-support.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -501,6 +501,9 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Fri May 30 2025 Neal Gompa - 40.22.3.30-1.alma.3 +- Refresh Btrfs support patch + * Wed May 28 2025 Neal Gompa - 40.22.3.30-1.alma.2 - Refresh AlmaLinux patches - Enable Btrfs support for AlmaLinux