From 30f9272ddb6a22a238dac4819a8a45beba6f5a6b Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Wed, 6 Dec 2023 18:28:45 +0100 Subject: [PATCH 1/5] Remove the autostep kickstart command in Fedora 40 This command was deprecated since Fedora 34. Resolves: INSTALLER-3849 --- pyanaconda/core/kickstart/commands.py | 1 - pyanaconda/kickstart.py | 1 - 2 files changed, 2 deletions(-) diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py index b16b11aac4f..7b00f3db2a8 100644 --- a/pyanaconda/core/kickstart/commands.py +++ b/pyanaconda/core/kickstart/commands.py @@ -25,7 +25,6 @@ # Supported kickstart commands. from pykickstart.commands.authselect import F28_Authselect as Authselect from pykickstart.commands.autopart import F38_AutoPart as AutoPart -from pykickstart.commands.autostep import F34_AutoStep as AutoStep from pykickstart.commands.bootloader import F39_Bootloader as Bootloader from pykickstart.commands.btrfs import F23_BTRFS as BTRFS from pykickstart.commands.cdrom import FC3_Cdrom as Cdrom diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 680f4a69dc7..899d45a8267 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -191,7 +191,6 @@ class AnacondaKickstartSpecification(KickstartSpecification): """The kickstart specification of the main process.""" commands = { - "autostep": COMMANDS.AutoStep, "cmdline": COMMANDS.DisplayMode, "eula": COMMANDS.Eula, "graphical": COMMANDS.DisplayMode, From 7b7e772721db8442b2966400b8b1fdf2748a0b5f Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Thu, 25 Jan 2024 15:37:17 +0100 Subject: [PATCH 2/5] Remove the method kickstart command in Fedora 40 This command was deprecated since Fedora 34. Resolves: INSTALLER-3849 --- pyanaconda/core/kickstart/commands.py | 1 - pyanaconda/kickstart.py | 1 - 2 files changed, 2 deletions(-) diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py index 7b00f3db2a8..0987b55cdca 100644 --- a/pyanaconda/core/kickstart/commands.py +++ b/pyanaconda/core/kickstart/commands.py @@ -48,7 +48,6 @@ from pykickstart.commands.logging import F34_Logging as Logging 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 from pykickstart.commands.network import F39_Network as Network from pykickstart.commands.nfs import FC6_NFS as NFS diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 899d45a8267..853fb037f62 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -196,7 +196,6 @@ class AnacondaKickstartSpecification(KickstartSpecification): "graphical": COMMANDS.DisplayMode, "halt": COMMANDS.Reboot, "logging": COMMANDS.Logging, - "method": COMMANDS.Method, "poweroff": COMMANDS.Reboot, "reboot": COMMANDS.Reboot, "rescue": COMMANDS.Rescue, From 45ff72525396027f078bad75b4c5f3dc43e5fd42 Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Wed, 24 Jan 2024 18:12:23 +0100 Subject: [PATCH 3/5] Remove the logging --level kickstart option in Fedora 40 This option was deprecated since Fedora 34. Resolves: INSTALLER-3849 --- anaconda.spec.in | 2 +- pyanaconda/core/kickstart/commands.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 14eaf3f2ad8..3a0b63a2bf3 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -38,7 +38,7 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers %define libxklavierver 5.4 %define mehver 0.23-1 %define nmver 1.0 -%define pykickstartver 3.51-1 +%define pykickstartver 3.52-1 %define pypartedver 2.5-2 %define pythonblivetver 1:3.8.2-2 %define rpmver 4.15.0 diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py index 0987b55cdca..071e5388286 100644 --- a/pyanaconda/core/kickstart/commands.py +++ b/pyanaconda/core/kickstart/commands.py @@ -45,7 +45,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.logging import F40_Logging as Logging from pykickstart.commands.logvol import F29_LogVol as LogVol from pykickstart.commands.mediacheck import FC4_MediaCheck as MediaCheck from pykickstart.commands.mount import F27_Mount as Mount From add17cdabad6ddbb0b1045c0f501d37fc7bd15c5 Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Thu, 25 Jan 2024 15:52:46 +0100 Subject: [PATCH 4/5] Remove the repo --ignoregroups kickstart option in Fedora 40 This option was deprecated since Fedora 33. Resolves: INSTALLER-3849 --- pyanaconda/core/kickstart/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py index 071e5388286..3af74770f03 100644 --- a/pyanaconda/core/kickstart/commands.py +++ b/pyanaconda/core/kickstart/commands.py @@ -58,7 +58,7 @@ 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 +from pykickstart.commands.repo import F40_Repo as Repo from pykickstart.commands.reqpart import F23_ReqPart as ReqPart from pykickstart.commands.rescue import F10_Rescue as Rescue from pykickstart.commands.rhsm import RHEL8_RHSM as RHSM From 17916bd46fcad0bf0ce52bd13a387b4de6dc0c22 Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Wed, 31 Jan 2024 19:38:22 +0100 Subject: [PATCH 5/5] Deprecate timezone --isUtc, --ntpservers and --nontp kickstart options The future deprecation of these kickstart options was announced in Fedora 32 and 33. The support for these options was removed in the commit 51fcd02. Resolves: INSTALLER-3887 --- pyanaconda/core/kickstart/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py index 3af74770f03..88906366562 100644 --- a/pyanaconda/core/kickstart/commands.py +++ b/pyanaconda/core/kickstart/commands.py @@ -70,7 +70,7 @@ from pykickstart.commands.sshpw import F24_SshPw as SshPw from pykickstart.commands.sshkey import F22_SshKey as SshKey from pykickstart.commands.syspurpose import RHEL8_Syspurpose as Syspurpose -from pykickstart.commands.timezone import F33_Timezone as Timezone +from pykickstart.commands.timezone import F40_Timezone as Timezone from pykickstart.commands.timesource import F33_Timesource as Timesource from pykickstart.commands.updates import F34_Updates as Updates from pykickstart.commands.url import F30_Url as Url