Refresh btrfs support patch to fix logvol, partition, raid

This commit is contained in:
Andrew Lukoshko 2025-10-24 14:13:12 +00:00
parent 70fe686c34
commit 8c03805fc5

View File

@ -1,16 +1,19 @@
From 9cce119c569e40876793daa53a2798c9c6bb0439 Mon Sep 17 00:00:00 2001 From adf4df4605970b07d637475a0d78cfddc4640eb9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org> From: Neal Gompa <ngompa@centosproject.org>
Date: Thu, 26 Jun 2025 23:51:33 -0400 Date: Fri, 24 Oct 2025 09:07:23 -0400
Subject: [PATCH] btrfs: Restore support for Btrfs on RHEL10 Subject: [PATCH] btrfs: Restore support for Btrfs on RHEL10
Red Hat Enterprise Linux and baseline CentOS Stream have Red Hat Enterprise Linux and baseline CentOS Stream have
removed support for Btrfs, but we need it back for CentOS Hyperscale. removed support for Btrfs, but we need it back for CentOS Hyperscale.
--- ---
pykickstart/commands/autopart.py | 32 +------------------------------- pykickstart/commands/autopart.py | 32 +------------------------------
pykickstart/commands/btrfs.py | 9 +++------ pykickstart/commands/btrfs.py | 9 +++------
tests/commands/autopart.py | 3 +-- pykickstart/commands/logvol.py | 2 +-
tests/commands/btrfs.py | 7 ++----- pykickstart/commands/partition.py | 2 +-
4 files changed, 7 insertions(+), 44 deletions(-) pykickstart/commands/raid.py | 6 +++---
tests/commands/autopart.py | 3 +--
tests/commands/btrfs.py | 7 ++-----
7 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/pykickstart/commands/autopart.py b/pykickstart/commands/autopart.py diff --git a/pykickstart/commands/autopart.py b/pykickstart/commands/autopart.py
index d7b5c072..3e77e4f6 100644 index d7b5c072..3e77e4f6 100644
@ -76,6 +79,45 @@ index ac22c71f..a2825bf6 100644
- return op - return op
+class RHEL10_BTRFS(F23_BTRFS): +class RHEL10_BTRFS(F23_BTRFS):
+ pass + pass
diff --git a/pykickstart/commands/logvol.py b/pykickstart/commands/logvol.py
index 3a3b4e4a..8325918a 100644
--- a/pykickstart/commands/logvol.py
+++ b/pykickstart/commands/logvol.py
@@ -933,5 +933,5 @@ class RHEL8_LogVol(F29_LogVol):
class RHEL9_LogVol(RHEL8_LogVol):
pass
-class RHEL10_LogVol(RHEL8_LogVol):
+class RHEL10_LogVol(F29_LogVol):
pass
diff --git a/pykickstart/commands/partition.py b/pykickstart/commands/partition.py
index c3ef7ab8..b86fe104 100644
--- a/pykickstart/commands/partition.py
+++ b/pykickstart/commands/partition.py
@@ -777,5 +777,5 @@ class RHEL9_Partition(F34_Partition):
Btrfs support was removed.""" % versionToLongString(RHEL8)
return op
-class RHEL10_Partition(RHEL9_Partition):
+class RHEL10_Partition(F34_Partition):
pass
diff --git a/pykickstart/commands/raid.py b/pykickstart/commands/raid.py
index cc922167..9a0091d8 100644
--- a/pykickstart/commands/raid.py
+++ b/pykickstart/commands/raid.py
@@ -792,9 +792,9 @@ class RHEL8_Raid(F29_Raid):
class RHEL9_Raid(RHEL8_Raid):
pass
-class RHEL10_Raid(RHEL8_Raid):
- removedKeywords = RHEL8_Raid.removedKeywords
- removedAttrs = RHEL8_Raid.removedAttrs
+class RHEL10_Raid(F29_Raid):
+ removedKeywords = F29_Raid.removedKeywords
+ removedAttrs = F29_Raid.removedAttrs
def _device_cb(self, value):
# do not remove the "md" prefix from array name in RHEL10 and later
diff --git a/tests/commands/autopart.py b/tests/commands/autopart.py diff --git a/tests/commands/autopart.py b/tests/commands/autopart.py
index e7e8b220..81d459ee 100644 index e7e8b220..81d459ee 100644
--- a/tests/commands/autopart.py --- a/tests/commands/autopart.py
@ -124,5 +166,5 @@ index 8fee1f11..7e9043aa 100644
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
-- --
2.49.0 2.51.0