|
 |
b80b18 |
From 883db1972480ccb349ae884a5b1845dfde2651e6 Mon Sep 17 00:00:00 2001
|
|
|
b80b18 |
From: Neal Gompa <ngompa@centosproject.org>
|
|
|
b80b18 |
Date: Mon, 28 Jun 2021 23:18:46 -0400
|
|
|
b80b18 |
Subject: [PATCH 20001/20005] Revert "Remove kickstart btrfs support"
|
|
|
b80b18 |
|
|
|
b80b18 |
Restore Btrfs support for Kickstart so system installations can
|
|
|
b80b18 |
use Btrfs and images can be built using Lorax with Btrfs as the
|
|
|
b80b18 |
filesystem.
|
|
|
b80b18 |
|
|
|
b80b18 |
This reverts commit 7e1667fbdc289d62f1dc92411a1d263c22e4be52.
|
|
|
b80b18 |
---
|
|
|
b80b18 |
pyanaconda/core/kickstart/commands.py | 10 +++++-----
|
|
|
b80b18 |
pyanaconda/modules/storage/kickstart.py | 1 -
|
|
|
b80b18 |
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
b80b18 |
|
|
|
b80b18 |
diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py
|
|
|
b80b18 |
index 181045f..2074699 100644
|
|
|
b80b18 |
--- a/pyanaconda/core/kickstart/commands.py
|
|
|
b80b18 |
+++ b/pyanaconda/core/kickstart/commands.py
|
|
|
b80b18 |
@@ -24,10 +24,10 @@
|
|
|
b80b18 |
# Supported kickstart commands.
|
|
|
b80b18 |
from pykickstart.commands.authconfig import F28_Authconfig as Authconfig
|
|
|
b80b18 |
from pykickstart.commands.authselect import F28_Authselect as Authselect
|
|
|
b80b18 |
-from pykickstart.commands.autopart import RHEL9_AutoPart as AutoPart
|
|
|
b80b18 |
+from pykickstart.commands.autopart import F29_AutoPart as AutoPart
|
|
|
b80b18 |
from pykickstart.commands.autostep import F34_AutoStep as AutoStep
|
|
|
b80b18 |
from pykickstart.commands.bootloader import RHEL9_Bootloader as Bootloader
|
|
|
b80b18 |
-from pykickstart.commands.btrfs import RHEL9_BTRFS as BTRFS
|
|
|
b80b18 |
+from pykickstart.commands.btrfs import F23_BTRFS as BTRFS
|
|
|
b80b18 |
from pykickstart.commands.cdrom import FC3_Cdrom as Cdrom
|
|
|
b80b18 |
from pykickstart.commands.clearpart import F28_ClearPart as ClearPart
|
|
|
b80b18 |
from pykickstart.commands.displaymode import F26_DisplayMode as DisplayMode
|
|
|
b80b18 |
@@ -47,7 +47,7 @@ from pykickstart.commands.keyboard import F18_Keyboard as Keyboard
|
|
|
b80b18 |
from pykickstart.commands.lang import F19_Lang as Lang
|
|
|
b80b18 |
from pykickstart.commands.liveimg import F19_Liveimg as Liveimg
|
|
|
b80b18 |
from pykickstart.commands.logging import F34_Logging as Logging
|
|
|
b80b18 |
-from pykickstart.commands.logvol import RHEL9_LogVol as LogVol
|
|
|
b80b18 |
+from pykickstart.commands.logvol import F29_LogVol as LogVol
|
|
|
b80b18 |
from pykickstart.commands.mediacheck import FC4_MediaCheck as MediaCheck
|
|
|
b80b18 |
from pykickstart.commands.method import F34_Method as Method
|
|
|
b80b18 |
from pykickstart.commands.mount import F27_Mount as Mount
|
|
|
b80b18 |
@@ -56,8 +56,8 @@ from pykickstart.commands.nfs import FC6_NFS as NFS
|
|
|
b80b18 |
from pykickstart.commands.nvdimm import F28_Nvdimm as Nvdimm
|
|
|
b80b18 |
from pykickstart.commands.ostreesetup import RHEL9_OSTreeSetup as OSTreeSetup
|
|
|
b80b18 |
from pykickstart.commands.ostreecontainer import RHEL9_OSTreeContainer as OSTreeContainer
|
|
|
b80b18 |
-from pykickstart.commands.partition import RHEL9_Partition as Partition
|
|
|
b80b18 |
-from pykickstart.commands.raid import RHEL9_Raid as Raid
|
|
|
b80b18 |
+from pykickstart.commands.partition import F34_Partition as Partition
|
|
|
b80b18 |
+from pykickstart.commands.raid import F29_Raid as Raid
|
|
|
b80b18 |
from pykickstart.commands.realm import F19_Realm as Realm
|
|
|
b80b18 |
from pykickstart.commands.reboot import F23_Reboot as Reboot
|
|
|
b80b18 |
from pykickstart.commands.repo import F33_Repo as Repo
|
|
|
b80b18 |
diff --git a/pyanaconda/modules/storage/kickstart.py b/pyanaconda/modules/storage/kickstart.py
|
|
|
b80b18 |
index f9cbbcb..0f33377 100644
|
|
|
b80b18 |
--- a/pyanaconda/modules/storage/kickstart.py
|
|
|
b80b18 |
+++ b/pyanaconda/modules/storage/kickstart.py
|
|
|
b80b18 |
@@ -105,7 +105,6 @@ class BTRFS(COMMANDS.BTRFS):
|
|
|
b80b18 |
|
|
|
b80b18 |
def parse(self, args):
|
|
|
b80b18 |
"""Parse the command."""
|
|
|
b80b18 |
- # pylint: disable=assignment-from-no-return
|
|
|
b80b18 |
retval = super().parse(args)
|
|
|
b80b18 |
|
|
|
b80b18 |
# Check the file system type.
|
|
|
b80b18 |
--
|
|
|
b80b18 |
2.43.0
|
|
|
b80b18 |
|