Backport PR #4624 to fix anaconda with pykickstart 3.47

This commit is contained in:
Adam Williamson 2023-03-17 20:40:19 -07:00
parent 4bed036553
commit c7a44b4788
2 changed files with 58 additions and 1 deletions

View File

@ -0,0 +1,51 @@
From 41969ea6ccda5dcabac7232fb73a9307bc7bc67a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 17 Mar 2023 18:17:02 -0700
Subject: [PATCH] Adjust to pykickstart moving new network commands to F39
Without this, anaconda fails to run with pykickstart 3.47.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
dracut/parse-kickstart | 2 +-
pyanaconda/core/kickstart/commands.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index c81ddb0813..3b1d26fbce 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -52,7 +52,7 @@ from pykickstart.commands.url import F30_Url as Url
from pykickstart.commands.updates import F34_Updates as Updates
from pykickstart.commands.mediacheck import FC4_MediaCheck as MediaCheck
from pykickstart.commands.driverdisk import F14_DriverDisk as DriverDisk
-from pykickstart.commands.network import F38_Network as Network
+from pykickstart.commands.network import F39_Network as Network
from pykickstart.commands.displaymode import F26_DisplayMode as DisplayMode
from pykickstart.commands.bootloader import F39_Bootloader as Bootloader
diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py
index 83e17f25ea..d7b4ef932d 100644
--- a/pyanaconda/core/kickstart/commands.py
+++ b/pyanaconda/core/kickstart/commands.py
@@ -50,7 +50,7 @@ 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 F38_Network as Network
+from pykickstart.commands.network import F39_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 F21_OSTreeSetup as OSTreeSetup
@@ -91,7 +91,7 @@ from pykickstart.commands.group import F12_GroupData as GroupData
from pykickstart.commands.iscsi import F17_IscsiData as IscsiData
from pykickstart.commands.logvol import F29_LogVolData as LogVolData
from pykickstart.commands.mount import F27_MountData as MountData
-from pykickstart.commands.network import F38_NetworkData as NetworkData
+from pykickstart.commands.network import F39_NetworkData as NetworkData
from pykickstart.commands.nvdimm import F28_NvdimmData as NvdimmData
from pykickstart.commands.partition import F29_PartData as PartData
from pykickstart.commands.raid import F29_RaidData as RaidData
--
2.40.0

View File

@ -1,7 +1,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 39.5 Version: 39.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -11,6 +11,9 @@ URL: http://fedoraproject.org/wiki/Anaconda
# ./autogen.sh # ./autogen.sh
# make dist # make dist
Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2
# https://github.com/rhinstaller/anaconda/pull/4624
# Fix anaconda with pykickstart 3.47
Patch0: 0001-Adjust-to-pykickstart-moving-new-network-commands-to.patch
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@ -463,6 +466,9 @@ rm -rf \
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Fri Mar 17 2023 Adam Williamson <awilliam@redhat.com> - 39.5-2
- Backport PR #4624 to fix anaconda with pykickstart 3.47
* Tue Mar 14 2023 Packit <hello@packit.dev> - 39.5-1 * Tue Mar 14 2023 Packit <hello@packit.dev> - 39.5-1
- Revert "Enable TFTP support (#2071350)" (vslavik) - Revert "Enable TFTP support (#2071350)" (vslavik)
- CONTRIBUTING: Add note about systemd-boot (jeremy.linton) - CONTRIBUTING: Add note about systemd-boot (jeremy.linton)