summaryrefslogtreecommitdiffstats
path: root/debian/patches/nm-path
blob: 802da2839ff7994432c2646458b42da652e3d8a9 (plain)
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
--- 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