rpms/pykickstart
6
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix pykickstart/commands/raid.py part

Browse Source
This commit is contained in:
Andrew Lukoshko 2025-10-24 15:02:16 +00:00
parent f0d5985c1e
commit d0d93267bb
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-btrfs-Restore-support-for-Btrfs-on-RHEL10.patch
View File

@ -1,4 +1,4 @@
From adf4df4605970b07d637475a0d78cfddc4640eb9 Mon Sep 17 00:00:00 2001
From 350cb02a73eb24892f1aa1e36197f186a9350c63 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Fri, 24 Oct 2025 09:07:23 -0400
Subject: [PATCH] btrfs: Restore support for Btrfs on RHEL10
@ -10,13 +10,13 @@ removed support for Btrfs, but we need it back for CentOS Hyperscale.
pykickstart/commands/btrfs.py | 9 +++------
pykickstart/commands/logvol.py | 2 +-
pykickstart/commands/partition.py | 2 +-
pykickstart/commands/raid.py | 6 +++---
pykickstart/commands/raid.py | 2 +-
tests/commands/autopart.py | 3 +--
tests/commands/btrfs.py | 7 ++-----
7 files changed, 12 insertions(+), 49 deletions(-)
7 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/pykickstart/commands/autopart.py b/pykickstart/commands/autopart.py
index d7b5c072..3e77e4f6 100644
index d7b5c07..3e77e4f 100644
--- a/pykickstart/commands/autopart.py
+++ b/pykickstart/commands/autopart.py
@@ -599,34 +599,4 @@ class F38_AutoPart(F29_AutoPart):
@ -56,7 +56,7 @@ index d7b5c072..3e77e4f6 100644
- return op
+ pass
diff --git a/pykickstart/commands/btrfs.py b/pykickstart/commands/btrfs.py
index ac22c71f..a2825bf6 100644
index ac22c71..a2825bf 100644
--- a/pykickstart/commands/btrfs.py
+++ b/pykickstart/commands/btrfs.py
@@ -19,7 +19,7 @@
@ -80,7 +80,7 @@ index ac22c71f..a2825bf6 100644
+class RHEL10_BTRFS(F23_BTRFS):
+ pass
diff --git a/pykickstart/commands/logvol.py b/pykickstart/commands/logvol.py
index 3a3b4e4a..8325918a 100644
index 3a3b4e4..8325918 100644
--- a/pykickstart/commands/logvol.py
+++ b/pykickstart/commands/logvol.py
@@ -933,5 +933,5 @@ class RHEL8_LogVol(F29_LogVol):
@ -91,7 +91,7 @@ index 3a3b4e4a..8325918a 100644
+class RHEL10_LogVol(F29_LogVol):
pass
diff --git a/pykickstart/commands/partition.py b/pykickstart/commands/partition.py
index c3ef7ab8..b86fe104 100644
index c3ef7ab..b86fe10 100644
--- a/pykickstart/commands/partition.py
+++ b/pykickstart/commands/partition.py
@@ -777,5 +777,5 @@ class RHEL9_Partition(F34_Partition):
@ -102,24 +102,18 @@ index c3ef7ab8..b86fe104 100644
+class RHEL10_Partition(F34_Partition):
pass
diff --git a/pykickstart/commands/raid.py b/pykickstart/commands/raid.py
index cc922167..9a0091d8 100644
index ac60f38..24f7769 100644
--- a/pykickstart/commands/raid.py
+++ b/pykickstart/commands/raid.py
@@ -792,9 +792,9 @@ class RHEL8_Raid(F29_Raid):
@@ -792,5 +792,5 @@ 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
pass
diff --git a/tests/commands/autopart.py b/tests/commands/autopart.py
index e7e8b220..81d459ee 100644
index e7e8b22..81d459e 100644
--- a/tests/commands/autopart.py
+++ b/tests/commands/autopart.py
@@ -165,7 +165,7 @@ class F17_TestCase(F16_TestCase):
@ -140,7 +134,7 @@ index e7e8b220..81d459ee 100644
if __name__ == "__main__":
unittest.main()
diff --git a/tests/commands/btrfs.py b/tests/commands/btrfs.py
index 8fee1f11..7e9043aa 100644
index 8fee1f1..7e9043a 100644
--- a/tests/commands/btrfs.py
+++ b/tests/commands/btrfs.py
@@ -20,7 +20,6 @@
@ -166,5 +160,5 @@ index 8fee1f11..7e9043aa 100644
if __name__ == "__main__":
unittest.main()
--
2.51.0
2.43.7