Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

network: skip calling setup-ip from network-manager-prepare-conf-dir

Browse Source 
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.
This commit is contained in:
Marek Marczykowski-Górecki 2021-01-03 22:36:08 +01:00
parent 932727b3df
commit 244fca8f66
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
network/network-manager-prepare-conf-dir
View File

@ -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/^#?unmanaged-devices=.*/unmanaged-devices=$unmanaged_devices/" /etc/NetworkManager/NetworkManager.conf
sed -r -i -e "s/^#?plugins=.*/plugins=keyfile/" /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 exit 0