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