summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-06-17 11:01:51 -0400
committerMike Gilbert <floppym@gentoo.org>2021-06-17 11:01:51 -0400
commit1e5c3786ee37ebca4e26bc2df7ce32541a46146a (patch)
tree5f87f2d3f7afbab6d3a23c22b7aa759589a5cb30
parentwww-servers/tomcat: bump to 10.0.7 (diff)
downloadgentoo-1e5c3786ee37ebca4e26bc2df7ce32541a46146a.tar.gz
gentoo-1e5c3786ee37ebca4e26bc2df7ce32541a46146a.tar.bz2
gentoo-1e5c3786ee37ebca4e26bc2df7ce32541a46146a.zip
sys-kernel/dracut: backport fix for Network Manager
Closes: https://bugs.gentoo.org/775671 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--sys-kernel/dracut/dracut-053-r1.ebuild (renamed from sys-kernel/dracut/dracut-053.ebuild)1
-rw-r--r--sys-kernel/dracut/files/053-network-manager.patch24
2 files changed, 25 insertions, 0 deletions
diff --git a/sys-kernel/dracut/dracut-053.ebuild b/sys-kernel/dracut/dracut-053-r1.ebuild
index 670c8599df84..aabffa07bfb6 100644
--- a/sys-kernel/dracut/dracut-053.ebuild
+++ b/sys-kernel/dracut/dracut-053-r1.ebuild
@@ -63,6 +63,7 @@ DOCS=( AUTHORS README.md README.generic README.kernel )
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
+ "${FILESDIR}"/053-network-manager.patch
"${FILESDIR}"/gentoo-ldconfig-paths.patch
)
diff --git a/sys-kernel/dracut/files/053-network-manager.patch b/sys-kernel/dracut/files/053-network-manager.patch
new file mode 100644
index 000000000000..c3b337733b7f
--- /dev/null
+++ b/sys-kernel/dracut/files/053-network-manager.patch
@@ -0,0 +1,24 @@
+From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 31 Mar 2021 16:11:41 +0200
+Subject: [PATCH] fix(network-manager): no default deps for nm-run.service
+
+Otherwise nm-run.service will run only in basic.target, which is too
+late in the initramfs.
+---
+ modules.d/35network-manager/nm-run.service | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service
+index 63fe7564d0..f3493c41a3 100644
+--- a/modules.d/35network-manager/nm-run.service
++++ b/modules.d/35network-manager/nm-run.service
+@@ -2,6 +2,8 @@
+ # SPDX-License-Identifier: GPL-2.0-or-later
+
+ [Unit]
++DefaultDependencies=no
++
+ #make sure all devices showed up
+ Wants=systemd-udev-settle.service
+ After=systemd-udev-settle.service