244fca8f66
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.
24 lines
864 B
Bash
Executable File
24 lines
864 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# Source Qubes library.
|
|
# shellcheck source=init/functions
|
|
. /usr/lib/qubes/init/functions
|
|
|
|
NM_CONFIG_DIR=/etc/NetworkManager/system-connections
|
|
if [ -d $NM_CONFIG_DIR ] && [ ! -h $NM_CONFIG_DIR ]; then
|
|
mkdir -p /rw/config/NM-system-connections
|
|
mv $NM_CONFIG_DIR/* /rw/config/NM-system-connections/ 2> /dev/null || true
|
|
rmdir $NM_CONFIG_DIR
|
|
ln -s /rw/config/NM-system-connections $NM_CONFIG_DIR
|
|
fi
|
|
|
|
# Do not manage xen-provided network devices
|
|
unmanaged_devices=mac:fe:ff:ff:ff:ff:ff
|
|
#for mac in `xenstore-ls device/vif | grep mac | cut -d= -f2 | tr -d '" '`; do
|
|
# unmanaged_devices="$unmanaged_devices;mac:$mac"
|
|
#done
|
|
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
|
|
|
|
exit 0
|