From 8fc220e0c1bae003c2f36e05841ae6ab73799a4c Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Wed, 18 Jan 2023 18:46:21 +0000 Subject: [PATCH] dracut: patch dracut-network meta module should check if module exists --- srcpkgs/dracut/patches/network.patch | 32 ++++++++++++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dracut/patches/network.patch diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch new file mode 100644 index 000000000000..09f08e327503 --- /dev/null +++ b/srcpkgs/dracut/patches/network.patch @@ -0,0 +1,32 @@ +From 209812fe905ab8a66e0c131a1173dd46ee7c4cc7 Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos +Date: Wed, 18 Jan 2023 20:50:27 +0000 +Subject: [PATCH] meta module should check if module exists + +Bug: https://github.com/dracutdevs/dracut/issues/1756 +--- + modules.d/40network/module-setup.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index d30f496..a69978c 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -17,11 +17,11 @@ depends() { + done; + + if [ -z "$network_handler" ]; then +- if find_binary wicked &>/dev/null ; then ++ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && find_binary wicked &>/dev/null ; then + network_handler="network-wicked" +- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then ++ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then + network_handler="network-manager" +- else ++ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then + network_handler="network-legacy" + fi + fi +-- +2.34.1 + diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index f490f37b3cf0..63153c5fe0bd 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -2,7 +2,7 @@ pkgname=dracut reverts="056_1" version=053 -revision=6 +revision=7 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf"