mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Allow NetworkManager and systemd-networkd
While it is unusual to run both NetworkManager and systemd-networkd simultaneiously and doing so can cause startup problems, there is nothing inherently wrong with doing so: the services are not incompatible and some people run both, each managing different interfaces. The Armbian build framework enables one or the other but not both. Therefore, if both are enabled at first login, it is probably because the user has manually modified the image. In this case, trust that the user knows what they are doing and don't disable one of them.
This commit is contained in:
@@ -668,19 +668,6 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
|
||||
# on network-online.target working correctly otherwise they will likely fail on boot
|
||||
# Same goes for systemd-networkd stack
|
||||
# https://github.com/armbian/build/issues/7896
|
||||
if
|
||||
systemctl is-enabled --quiet NetworkManager &&
|
||||
systemctl is-enabled --quiet systemd-networkd
|
||||
then
|
||||
echo "Both NetworkManager and systemd-networkd services are enabled."
|
||||
echo "This is known to cause problems with network startup."
|
||||
echo "systemd-networkd will be disabled..."
|
||||
sleep 30 # Give the user time to see the message
|
||||
systemctl stop systemd-networkd
|
||||
systemctl disable systemd-networkd
|
||||
echo "systemd-networkd has been disabled."
|
||||
fi
|
||||
|
||||
if
|
||||
systemctl is-enabled --quiet NetworkManager &&
|
||||
! systemctl is-enabled --quiet NetworkManager-wait-online
|
||||
|
||||
Reference in New Issue
Block a user