Skip to content

Commit ac0e8f7

Browse files
dustymabeharaldh
authored andcommitted
fix(network-manager): only run NetworkManager if rd.neednet=1
Don't run the new systemd unit (nm-run.service) if rd.neednet=1 isn't set. nm-initrd-generator will generate configuration even without rd.neednet=1 so determining if we should start based on just if connection profiles exist isn't enough. We need some other indicator. In this case we lay down a /run/NetworkManager/initrd/neednet if rd.neednet=1, which is used by nm-run.service to determine the need to run.
1 parent 1f21fac commit ac0e8f7

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

modules.d/35network-manager/nm-lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ nm_generate_connections() {
1414
/etc/sysconfig/network-scripts/ifcfg-*; do
1515
[ -f "$i" ] || continue
1616
echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh
17+
: > /run/NetworkManager/initrd/neednet # activate nm-run.service
1718
break
1819
done
1920
fi

modules.d/35network-manager/nm-run.service

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Before=network.target network-online.target
1515
#run before we try to mount anything from the dracut hooks
1616
Before=dracut-initqueue.service
1717

18+
#do not run if networking not needed
19+
ConditionPathExists=/run/NetworkManager/initrd/neednet
20+
1821
#do not run, if there is no configuration
1922
ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/*
2023
ConditionPathExistsGlob=|/run/NetworkManager/system-connections/*

0 commit comments

Comments
 (0)