From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dracut: fix broken network module, again
Date: Wed, 18 Jan 2023 19:53:30 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41721@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages more-like-dra-fucked
https://github.com/void-linux/void-packages/pull/41721
dracut: fix broken network module, again
#### Testing the changes
- I tested the changes in this PR: **by thought experiment**
@classabbyamp I know this is patch is undesirable from a long-term maintenance standpoint because the days of `network-legacy` are numbered. Upstream should really do something about dispatching to the right network backend on systemd-free systems, but for now, we can at least make things work. Please offer comments and let me know if this resolves issues relating to mklive.
@zdykstra If you are interested in attaching your name to this package, I'd be happy to add it here and know that somebody knowledgeable and invested will claim responsibility.
A patch file from https://github.com/void-linux/void-packages/pull/41721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-more-like-dra-fucked-41721.patch --]
[-- Type: text/x-diff, Size: 2027 bytes --]
From 1c03835df985d95a296b257934a1256a85582104 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 18 Jan 2023 13:40:02 -0500
Subject: [PATCH] dracut: fix broken network module, again
---
srcpkgs/dracut/patches/network-fix.patch | 23 +++++++++++++++++++++++
srcpkgs/dracut/template | 2 +-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dracut/patches/network-fix.patch
diff --git a/srcpkgs/dracut/patches/network-fix.patch b/srcpkgs/dracut/patches/network-fix.patch
new file mode 100644
index 000000000000..19ab124e465b
--- /dev/null
+++ b/srcpkgs/dracut/patches/network-fix.patch
@@ -0,0 +1,23 @@
+The `network` module tries to pick a default network backend based on the
+availability of executables used by those backends, but Void removes those that
+depend on systemd. This patch preserves the "use a given backend if it's
+included in the image" because modules that aren't installed should never be
+included, but replaces the default with network-legacy.
+
+--- a/modules.d/40network/module-setup.sh
++++ b/modules.d/40network/module-setup.sh
+@@ -17,13 +17,7 @@
+ done;
+
+ if [ -z "$network_handler" ]; then
+- if find_binary wicked &>/dev/null ; then
+- network_handler="network-wicked"
+- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
+- network_handler="network-manager"
+- else
+- network_handler="network-legacy"
+- fi
++ network_handler="network-legacy"
+ fi
+ echo "kernel-network-modules $network_handler"
+ return 0
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"
next reply other threads:[~2023-01-18 18:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 18:53 ahesford [this message]
2023-01-18 18:57 ` ahesford
2023-01-18 18:57 ` [PR PATCH] [Closed]: " ahesford
2023-01-18 20:36 ` LaszloGombos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41721@inbox.vuxu.org \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).