Skip to content

Commit

Permalink
fix(network-manager): cope with distributions not using libexec
Browse files Browse the repository at this point in the history
  • Loading branch information
haraldh committed May 14, 2021
1 parent 3ad3b3a commit 22d6863
Showing 2 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions modules.d/35network-manager/module-setup.sh
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ install() {
inst_multiple ip sed grep

inst NetworkManager
inst /usr/libexec/nm-initrd-generator
inst_multiple -o /usr/{lib,libexec}/nm-initrd-generator
inst_multiple -o teamd dhclient
inst_hook cmdline 99 "$moddir/nm-config.sh"
if dracut_module_included "systemd"; then
@@ -59,7 +59,7 @@ install() {
inst_simple "$moddir/nm-lib.sh" "/lib/nm-lib.sh"

if [[ -x "$initdir/usr/sbin/dhclient" ]]; then
inst /usr/libexec/nm-dhcp-helper
inst_multiple -o /usr/{lib,libexec}/nm-dhcp-helper
elif ! [[ -e "$initdir/etc/machine-id" ]]; then
# The internal DHCP client silently fails if we
# have no machine-id
11 changes: 9 additions & 2 deletions modules.d/35network-manager/nm-lib.sh
Original file line number Diff line number Diff line change
@@ -4,8 +4,15 @@ type getcmdline > /dev/null 2>&1 || . /lib/dracut-lib.sh

nm_generate_connections() {
rm -f /run/NetworkManager/system-connections/*
# shellcheck disable=SC2046
/usr/libexec/nm-initrd-generator -- $(getcmdline)
if [ -x /usr/libexec/nm-initrd-generator ]; then
# shellcheck disable=SC2046
/usr/libexec/nm-initrd-generator -- $(getcmdline)
elif [ -x /usr/lib/nm-initrd-generator ]; then
# shellcheck disable=SC2046
/usr/lib/nm-initrd-generator -- $(getcmdline)
else
derror "nm-initrd-generator not found"
fi

if getargbool 0 rd.neednet; then
for i in /usr/lib/NetworkManager/system-connections/* \

0 comments on commit 22d6863

Please sign in to comment.