forked from rpms/pykickstart
AlmaLinux changes: Enable Btrfs support
This commit is contained in:
parent
f1d60b7fd2
commit
363f6e1bbd
@ -0,0 +1,65 @@
|
||||
From 7b9c6dee2e0817f9b6513017f7e3fe9083d4f967 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <ngompa@centosproject.org>
|
||||
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
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
Name: pykickstart
|
||||
Version: 3.52.9
|
||||
Release: 1%{?dist}
|
||||
Release: 1%{?dist}.alma.1
|
||||
License: GPL-2.0-only
|
||||
Summary: Python utilities for manipulating kickstart files.
|
||||
Url: http://fedoraproject.org/wiki/pykickstart
|
||||
@ -17,6 +17,9 @@ Source0: %{name}-%{version}.tar.gz
|
||||
Source1: %{name}-%{version}.tar.gz.asc
|
||||
%endif
|
||||
|
||||
# AlmaLinux changes
|
||||
Patch1001: 0001-btrfs-Restore-support-for-the-btrfs-command-on-RHEL.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: gettext
|
||||
@ -78,6 +81,9 @@ LC_ALL=C make PYTHON=%{__python3} test-no-coverage
|
||||
%{python3_sitelib}/pykickstart*.egg-info
|
||||
|
||||
%changelog
|
||||
* Wed May 28 2025 Neal Gompa <ngompa@almalinux.org> - 3.52.9-1.alma.1
|
||||
- AlmaLinux changes: Enable Btrfs support
|
||||
|
||||
* Tue May 27 2025 Brian C. Lane <bcl@redhat.com> - 3.52.9-1
|
||||
- workflows: Switch to using ubuntu-latest (bcl)
|
||||
Related: RHEL-80086
|
||||
|
Loading…
Reference in New Issue
Block a user