From 2681478785de4b7c902ae277990b601eb3af1879 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 | 35 ++++++++++++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 36 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..75a377797136 --- /dev/null +++ b/srcpkgs/dracut/patches/network.patch @@ -0,0 +1,35 @@ +From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos +Date: Wed, 18 Jan 2023 19:59:24 +0000 +Subject: [PATCH] meta module should check if module exists + +Bug: https://github.com/dracutdevs/dracut/issues/1756 +--- + modules.d/40network/module-setup.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index ba7104d9..8f9e5bff 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -17,13 +17,13 @@ depends() { + done + + if [ -z "$network_handler" ]; then +- if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then ++ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then + network_handler="connman" +- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then ++ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then + network_handler="network-manager" +- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then ++ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then + network_handler="systemd-networkd" +- 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"