commit 134550167346573d648e107bb308e758615ea4b8 Author: Andrew Lukoshko Date: Fri May 30 18:26:54 2025 +0000 Enable Btrfs support diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..9a8e80e --- /dev/null +++ b/config.yaml @@ -0,0 +1,21 @@ +actions: + - replace: + - target: "spec" + find: "%setup -q" + replace: "%autosetup -p 1" + count: 1 + + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Neal Gompa" + email: "ngompa@almalinux.org" + line: + - "AlmaLinux changes: Enable Btrfs support" + + - add_files: + - type: "patch" + name: "0001-btrfs-Restore-support-for-the-btrfs-command-on-RHEL.patch" + number: 1001 diff --git a/files/0001-btrfs-Restore-support-for-the-btrfs-command-on-RHEL.patch b/files/0001-btrfs-Restore-support-for-the-btrfs-command-on-RHEL.patch new file mode 100644 index 0000000..2a0e639 --- /dev/null +++ b/files/0001-btrfs-Restore-support-for-the-btrfs-command-on-RHEL.patch @@ -0,0 +1,65 @@ +From 7b9c6dee2e0817f9b6513017f7e3fe9083d4f967 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sat, 25 Jan 2025 18:40:04 -0500 +Subject: [PATCH] btrfs: Restore support for the btrfs command on RHEL10 + +Red Hat Enterprise Linux and baseline CentOS Stream have +removed support for Btrfs, but we need it back for CentOS Hyperscale. +--- + pykickstart/commands/btrfs.py | 9 +++------ + tests/commands/btrfs.py | 7 ++----- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/pykickstart/commands/btrfs.py b/pykickstart/commands/btrfs.py +index ac22c71f..a2825bf6 100644 +--- a/pykickstart/commands/btrfs.py ++++ b/pykickstart/commands/btrfs.py +@@ -19,7 +19,7 @@ + # with the express permission of Red Hat, Inc. + # + from pykickstart.version import F17, F23, RHEL8, RHEL10, versionToLongString +-from pykickstart.base import BaseData, KickstartCommand, DeprecatedCommand, RemovedCommand ++from pykickstart.base import BaseData, KickstartCommand, DeprecatedCommand + from pykickstart.errors import KickstartParseError, KickstartParseWarning + from pykickstart.options import KSOptionParser, mountpoint + +@@ -280,8 +280,5 @@ class RHEL8_BTRFS(DeprecatedCommand, F23_BTRFS): + class RHEL9_BTRFS(RHEL8_BTRFS): + pass + +-class RHEL10_BTRFS(RemovedCommand, RHEL8_BTRFS): +- def _getParser(self): +- op = RHEL8_BTRFS._getParser(self) +- op.description += "\n\n.. versionremoved:: %s" % versionToLongString(RHEL10) +- return op ++class RHEL10_BTRFS(F23_BTRFS): ++ pass +diff --git a/tests/commands/btrfs.py b/tests/commands/btrfs.py +index 8fee1f11..7e9043aa 100644 +--- a/tests/commands/btrfs.py ++++ b/tests/commands/btrfs.py +@@ -20,7 +20,6 @@ + + import unittest + from tests.baseclass import CommandTest, CommandSequenceTest +-from pykickstart.base import RemovedCommand + from pykickstart.commands.btrfs import F17_BTRFSData, F23_BTRFSData + from pykickstart.errors import KickstartParseError, KickstartParseWarning + from pykickstart.version import F17 +@@ -199,11 +198,9 @@ class RHEL7_TestCase(F23_TestCase): + def runTest(self): + F23_TestCase.runTest(self) + +-class RHEL10_TestCase(RHEL7_TestCase): ++class RHEL10_TestCase(F23_TestCase): + def runTest(self): +- # make sure we've been removed +- parser = self.getParser("btrfs") +- self.assertEqual(issubclass(parser.__class__, RemovedCommand), True) ++ F23_TestCase.runTest(self) + + if __name__ == "__main__": + unittest.main() +-- +2.48.0 +