Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
Date: Thu, 17 Jun 2021 15:03:03
Message-Id: 1623942111.1e5c3786ee37ebca4e26bc2df7ce32541a46146a.floppym@gentoo
1 commit: 1e5c3786ee37ebca4e26bc2df7ce32541a46146a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 17 15:01:51 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 17 15:01:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5c3786
7
8 sys-kernel/dracut: backport fix for Network Manager
9
10 Closes: https://bugs.gentoo.org/775671
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 .../{dracut-053.ebuild => dracut-053-r1.ebuild} | 1 +
14 sys-kernel/dracut/files/053-network-manager.patch | 24 ++++++++++++++++++++++
15 2 files changed, 25 insertions(+)
16
17 diff --git a/sys-kernel/dracut/dracut-053.ebuild b/sys-kernel/dracut/dracut-053-r1.ebuild
18 similarity index 99%
19 rename from sys-kernel/dracut/dracut-053.ebuild
20 rename to sys-kernel/dracut/dracut-053-r1.ebuild
21 index 670c8599df8..aabffa07bfb 100644
22 --- a/sys-kernel/dracut/dracut-053.ebuild
23 +++ b/sys-kernel/dracut/dracut-053-r1.ebuild
24 @@ -63,6 +63,7 @@ DOCS=( AUTHORS README.md README.generic README.kernel )
25 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
26
27 PATCHES=(
28 + "${FILESDIR}"/053-network-manager.patch
29 "${FILESDIR}"/gentoo-ldconfig-paths.patch
30 )
31
32
33 diff --git a/sys-kernel/dracut/files/053-network-manager.patch b/sys-kernel/dracut/files/053-network-manager.patch
34 new file mode 100644
35 index 00000000000..c3b337733b7
36 --- /dev/null
37 +++ b/sys-kernel/dracut/files/053-network-manager.patch
38 @@ -0,0 +1,24 @@
39 +From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001
40 +From: Harald Hoyer <harald@××××××.com>
41 +Date: Wed, 31 Mar 2021 16:11:41 +0200
42 +Subject: [PATCH] fix(network-manager): no default deps for nm-run.service
43 +
44 +Otherwise nm-run.service will run only in basic.target, which is too
45 +late in the initramfs.
46 +---
47 + modules.d/35network-manager/nm-run.service | 2 ++
48 + 1 file changed, 2 insertions(+)
49 +
50 +diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service
51 +index 63fe7564d0..f3493c41a3 100644
52 +--- a/modules.d/35network-manager/nm-run.service
53 ++++ b/modules.d/35network-manager/nm-run.service
54 +@@ -2,6 +2,8 @@
55 + # SPDX-License-Identifier: GPL-2.0-or-later
56 +
57 + [Unit]
58 ++DefaultDependencies=no
59 ++
60 + #make sure all devices showed up
61 + Wants=systemd-udev-settle.service
62 + After=systemd-udev-settle.service