diff --git a/0020.patch b/0020.patch new file mode 100644 index 0000000..2043a54 --- /dev/null +++ b/0020.patch @@ -0,0 +1,39 @@ +From 3e912f878de8d310bd06199e03602c63d2b60dba Mon Sep 17 00:00:00 2001 +From: Radek Vykydal +Date: Tue, 20 Dec 2022 16:40:23 +0100 +Subject: [PATCH] fix(network-manager): allow running nm-run.sh multiple times + +This partially reverts +https://github.com/redhat-plumbers/dracut-rhel9/commit/77630365aed201a729c73a9ffda0733a75f3fee4 + +Anaconda needs to be able to run nm-run.sh to trigger online hooks again +after kickstart is fetched from storage and network is configured +accordingly. + +rhel-only +Resolves: rhbz#2157082 +--- + modules.d/35network-manager/nm-run.sh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh +index 7d8d61fa..6110733d 100755 +--- a/modules.d/35network-manager/nm-run.sh ++++ b/modules.d/35network-manager/nm-run.sh +@@ -2,11 +2,12 @@ + + type source_hook > /dev/null 2>&1 || . /lib/dracut-lib.sh + +-if [ -e /tmp/nm.done ]; then +- return +-fi +- + if [ -z "$DRACUT_SYSTEMD" ]; then ++ ++ if [ -e /tmp/nm.done ]; then ++ return ++ fi ++ + # Only start NM if networking is needed + if [ -e /run/NetworkManager/initrd/neednet ]; then + for i in /usr/lib/NetworkManager/system-connections/* \ diff --git a/dracut.spec b/dracut.spec index c5fce9f..34fff9f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 20.git20221213 +%define dist_free_release 21.git20230214 Name: dracut Version: 057 @@ -48,6 +48,7 @@ Patch16: 0016.patch Patch17: 0017.patch Patch18: 0018.patch Patch19: 0019.patch +Patch20: 0020.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -506,6 +507,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Tue Feb 14 2023 Pavel Valena - 057-21.git20230214 +- fix(network-manager): allow running nm-run.sh multiple times + * Tue Dec 13 2022 Pavel Valena - 057-20.git20221213 - refactor(url-lib): write curl output directly to file - fix(dracut-initramfs-restore.sh): initramfs detection not