Re: [PR PATCH] [Updated] dracut: patch dracut-network

[LaszloGombos <LaszloGombos@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages network
https://github.com/void-linux/void-packages/pull/41720

dracut: patch dracut-network
only network-legacy is supported by dracut-network.

Sadly https://github.com/void-linux/void-packages/pull/41031 introduced a regression, so until this PR lands, the regression is in place. Apologies . 

#### Testing the changes
- I tested the changes in this PR: **briefly**

Upstream Dracut discussion - https://github.com/dracutdevs/dracut/issues/1756
Gentoo discussion - https://github.com/gentoo/gentoo/pull/28777

CC @classabbyamp


A patch file from https://github.com/void-linux/void-packages/pull/41720.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-network-41720.patch --]
[-- Type: text/x-diff, Size: 2800 bytes --]

From 2681478785de4b7c902ae277990b601eb3af1879 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
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 <laszlo.gombos@gmail.com>
+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"