[PR PATCH] dracut: patch dracut-network

[PR PATCH] dracut: patch dracut-network

[LaszloGombos]

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

There is a new 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

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


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: 1669 bytes --]

From c845320db9736a14055ca51ad85a757c4ec499ea 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

only network-legacy is supported by dracut-network
---
 srcpkgs/dracut/patches/network.patch | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 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..3d5db25cb0ae
--- /dev/null
+++ b/srcpkgs/dracut/patches/network.patch
@@ -0,0 +1,29 @@
+From 5443396f3cb591f2589888b25e07f21f03989057 Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Sat, 24 Dec 2022 01:48:04 +0000
+Subject: [PATCH] When no systemd then only network-legacy is supported
+
+Bug: https://github.com/dracutdevs/dracut/issues/1756
+---
+ modules.d/40network/module-setup.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
+index 1ab13ef..da49947 100755
+--- a/modules.d/40network/module-setup.sh
++++ b/modules.d/40network/module-setup.sh
+@@ -16,6 +16,11 @@ depends() {
+         fi
+     done
+ 
++    # When systemd is not available only network-legacy is supported
++    if [ -z "$network_handler" ] && ! find_binary systemctl > /dev/null; then
++        network_handler="network-legacy"
++    fi
++
+     if [ -z "$network_handler" ]; then
+         if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
+             network_handler="network-wicked"
+-- 
+2.34.1
+

Re: dracut: patch dracut-network

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387606129

Comment:
This really belongs upstream, but for now seems fine to get us out of a logjam.

Some comments from upstream developers have indicated a desire to abandon support for anything besides systemd. While this is fine, it ought to be done in a single pass rather than death by 1000 cuts with subtle breakage like this. The upstream `network` module should properly dispatch to `network-legacy` in the meantime.

It is probably better to query whether the other backend modules are available and installable rather than looking for systemd and binaries that they require. Is this even possible in `module-setup.sh`?

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387673050

Comment:
@ahesford Really appreciate the timely feedback. 

> This really belongs upstream
I agree.

> Some comments from upstream developers have indicated a desire to abandon support for anything besides systemd. 
And some reviewers upstream are specifically focusing on bug fixes for non-systemd system.

Upstream failed attempts:
 - https://github.com/dracutdevs/dracut/pull/2136
 - https://github.com/dracutdevs/dracut/pull/2081 which was later rolled into https://github.com/dracutdevs/dracut/pull/2123 because of a review request  
 
> It is probably better to query whether the other backend modules are available 
https://github.com/dracutdevs/dracut/pull/2136 took a similar approach.  I decided to start with the Gentoo patch, but I can take the approach from https://github.com/dracutdevs/dracut/pull/2136 and tailor it to Void.
 
 

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387673050

Comment:
@ahesford Really appreciate the timely feedback. 

> This really belongs upstream

I agree.

> Some comments from upstream developers have indicated a desire to abandon support for anything besides systemd. 

And some reviewers upstream are specifically focusing on bug fixes for non-systemd system.

Upstream failed attempts:
 - https://github.com/dracutdevs/dracut/pull/2136
 - https://github.com/dracutdevs/dracut/pull/2081 which was later rolled into https://github.com/dracutdevs/dracut/pull/2123 because of a review request  
 
> It is probably better to query whether the other backend modules are available 

https://github.com/dracutdevs/dracut/pull/2136 took a similar approach.  I decided to start with the Gentoo patch, but I can take the approach from https://github.com/dracutdevs/dracut/pull/2136 and tailor it to Void.
 
 

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387673050

Comment:
@ahesford Really appreciate the timely feedback. 

> This really belongs upstream

I agree.

> Some comments from upstream developers have indicated a desire to abandon support for anything besides systemd. 

Some maintainers upstream are specifically focusing on bug fixes for non-systemd system.

Upstream failed attempts:
 - https://github.com/dracutdevs/dracut/pull/2136
 - https://github.com/dracutdevs/dracut/pull/2081 which was later rolled into https://github.com/dracutdevs/dracut/pull/2123 because of a review request  
 
> It is probably better to query whether the other backend modules are available 

https://github.com/dracutdevs/dracut/pull/2136 took a similar approach.  I decided to start with the Gentoo patch, but I can take the approach from https://github.com/dracutdevs/dracut/pull/2136 and tailor it to Void.
 
 

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

[LaszloGombos]

[-- 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: 2385 bytes --]

From f01f1a62ccaae5b486fd2359d322486ac489685f 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 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 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
+

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387719074

Comment:
Just noticed that an alternative patch landed. I leave this PR here for feedback, but this is no longer a priority to resolve the regression. 

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387719074

Comment:
Just noticed that an alternative patch landed. I leave this PR here for feedback, but this is no longer a priority to resolve the regression. 

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

[LaszloGombos]

[-- 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"

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387743877

Comment:
> needs a revision bump on the template but otherwise i think this is fine for now.

Done. Thanks !

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

[LaszloGombos]

[-- 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: 2408 bytes --]

From 8fc220e0c1bae003c2f36e05841ae6ab73799a4c 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 | 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 <laszlo.gombos@gmail.com>
+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"

Re: dracut: patch dracut-network

[LaszloGombos]

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

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1387673050

Comment:
@ahesford Really appreciate the timely feedback. 

> This really belongs upstream

I agree.

> Some comments from upstream developers have indicated a desire to abandon support for anything besides systemd. 

Some maintainers upstream are specifically focusing on bug fixes for non-systemd system.

Upstream failed attempts:
 - https://github.com/dracutdevs/dracut/pull/2136
 - https://github.com/dracutdevs/dracut/pull/2081 which was later rolled into https://github.com/dracutdevs/dracut/pull/2123 because of a request from a maintainer  
 
> It is probably better to query whether the other backend modules are available 

https://github.com/dracutdevs/dracut/pull/2136 took a similar approach.  I decided to start with the Gentoo patch, but I can take the approach from https://github.com/dracutdevs/dracut/pull/2136 and tailor it to Void.
 
 

Re: dracut: patch dracut-network

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41720#issuecomment-1396234333

Comment:
confirmed works with void-mklive's autoinstaller

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

[classabbyamp]

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

There's a merged pull request on the void-packages repository

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

Description:
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