From 244fca8f6604af77994135f2789f893082eeb2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 3 Jan 2021 22:36:08 +0100 Subject: [PATCH] network: skip calling setup-ip from network-manager-prepare-conf-dir The setup-ip script requires extra parameters (action and interface) not only env variables. Since NetworkManager service is already ordered after qubes-network-uplink.service, the setup-ip already did its job at this time - remove the call instead of fixing it. --- network/network-manager-prepare-conf-dir | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/network/network-manager-prepare-conf-dir b/network/network-manager-prepare-conf-dir index 3fd3027..79fb6e4 100755 --- a/network/network-manager-prepare-conf-dir +++ b/network/network-manager-prepare-conf-dir @@ -20,18 +20,4 @@ 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 -ACTION="add" -INTERFACE="$(get_qubes_managed_iface)" -export ACTION -export INTERFACE -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