1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -30,8 +30,8 @@
inst_multiple ip sed grep
inst NetworkManager
- inst_multiple -o /usr/{lib,libexec}/nm-initrd-generator
- inst_multiple -o /usr/{lib,libexec}/nm-daemon-helper
+ inst_multiple -o /usr/{lib,libexec}{,/NetworkManager}/nm-initrd-generator
+ inst_multiple -o /usr/{lib,libexec}{,/NetworkManager}/nm-daemon-helper
inst_multiple -o teamd dhclient
inst_hook cmdline 99 "$moddir/nm-config.sh"
if dracut_module_included "systemd"; then
--- a/modules.d/35network-manager/nm-lib.sh
+++ b/modules.d/35network-manager/nm-lib.sh
@@ -10,6 +10,9 @@
elif [ -x /usr/lib/nm-initrd-generator ]; then
# shellcheck disable=SC2046
/usr/lib/nm-initrd-generator -- $(getcmdline)
+ elif [ -x /usr/lib/NetworkManager/nm-initrd-generator ]; then
+ # shellcheck disable=SC2046
+ /usr/lib/NetworkManager/nm-initrd-generator -- $(getcmdline)
else
warn "nm-initrd-generator not found"
fi
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -21,7 +21,7 @@
network_handler="network-wicked"
elif [[ -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 [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/NetworkManager/nm-initrd-generator ]]; then
network_handler="network-manager"
elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
network_handler="systemd-networkd"
|
