From 836bf90e978b4ef4b4a547de9390c553eae3d8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 6 Apr 2018 01:52:11 +0200 Subject: [PATCH] network: make sure static NM configuration is created before NM start Avoid delays caused by default DHCP configuration, which would be used if no alternative is available at NetworkManager start time. --- network/network-manager-prepare-conf-dir | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/network/network-manager-prepare-conf-dir b/network/network-manager-prepare-conf-dir index d56b996..7eb09c1 100755 --- a/network/network-manager-prepare-conf-dir +++ b/network/network-manager-prepare-conf-dir @@ -16,4 +16,15 @@ unmanaged_devices=mac:fe:ff:ff:ff:ff:ff sed -r -i -e "s/^#?unmanaged-devices=.*/unmanaged-devices=$unmanaged_devices/" /etc/NetworkManager/NetworkManager.conf sed -r -i -e "s/^#?plugins=.*/plugins=keyfile/" /etc/NetworkManager/NetworkManager.conf +# setup uplink configuration if applicable - this needs to be done before +# starting NetworkManager, otherwise it will try default DHCP configuration +# first and only after a timeout fallback to static one - introducing delay in +# network connectivity +export INTERFACE=eth0 +if qubesdb-read /qubes-ip >/dev/null 2>/dev/null && + [ -e /sys/class/net/$INTERFACE ] && + [ ! -r /etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE ]; then + /usr/lib/qubes/setup-ip +fi + exit 0