|
@@ -8,16 +8,22 @@ if [ x$ip != x ]; then
|
|
|
/sbin/ifconfig $INTERFACE $ip netmask 255.255.255.255
|
|
|
/sbin/ifconfig $INTERFACE up
|
|
|
/sbin/route add -host $gateway dev $INTERFACE
|
|
|
- /sbin/route add default gw $gateway
|
|
|
+ if [ -f /var/run/qubes-service/set-default-route ]; then
|
|
|
+ /sbin/route add default gw $gateway
|
|
|
+ fi
|
|
|
/sbin/ethtool -K $INTERFACE sg off
|
|
|
/sbin/ethtool -K $INTERFACE tx off
|
|
|
- echo "nameserver $gateway" > /etc/resolv.conf
|
|
|
- echo "nameserver $secondary_dns" >> /etc/resolv.conf
|
|
|
+ echo > /etc/resolv.conf
|
|
|
+ if [ -f /var/run/qubes-service/set-dns-server ]; then
|
|
|
+ echo "nameserver $gateway" > /etc/resolv.conf
|
|
|
+ echo "nameserver $secondary_dns" >> /etc/resolv.conf
|
|
|
+ fi
|
|
|
if [ -f /var/run/qubes-service/network-manager ]; then
|
|
|
- cat > /etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE <<__EOF__
|
|
|
+ nm_config=/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE
|
|
|
+ cat > $nm_config <<__EOF__
|
|
|
[802-3-ethernet]
|
|
|
duplex=full
|
|
|
-
|
|
|
+
|
|
|
[ethernet]
|
|
|
mac-address=`ip l show dev $INTERFACE |grep link|awk '{print $2}'`
|
|
|
|
|
@@ -31,20 +37,28 @@ method=ignore
|
|
|
|
|
|
[ipv4]
|
|
|
method=manual
|
|
|
-dns=$gateway;$secondary_dns
|
|
|
-address1=$ip/32,$gateway
|
|
|
may-fail=false
|
|
|
__EOF__
|
|
|
- chmod 600 /etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE
|
|
|
+ if [ -f /var/run/qubes-service/set-dns-server ]; then
|
|
|
+ echo "dns=$gateway;$secondary_dns" >> $nm_config
|
|
|
+ fi
|
|
|
+ if [ -f /var/run/qubes-service/set-default-route ]; then
|
|
|
+ echo "address1=$ip/32,$gateway" >> $nm_config
|
|
|
+ else
|
|
|
+ echo "address1=$ip/32" >> $nm_config
|
|
|
+ fi
|
|
|
+ chmod 600 $nm_config
|
|
|
fi
|
|
|
network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
|
|
|
- if [ "x$network" != "x" ]; then
|
|
|
+ if [ "x$network" != "x" ] && [ -f /var/run/qubes-service/set-dns-server ]; then
|
|
|
gateway=$(qubesdb-read /qubes-netvm-gateway)
|
|
|
netmask=$(qubesdb-read /qubes-netvm-netmask)
|
|
|
secondary_dns=$(qubesdb-read /qubes-netvm-secondary-dns)
|
|
|
echo "NS1=$gateway" > /var/run/qubes/qubes-ns
|
|
|
echo "NS2=$secondary_dns" >> /var/run/qubes/qubes-ns
|
|
|
/usr/lib/qubes/qubes-setup-dnat-to-ns
|
|
|
+ fi
|
|
|
+ if [ "x$network" != "x" ]; then
|
|
|
[ -x /rw/config/qubes-ip-change-hook ] && /rw/config/qubes-ip-change-hook
|
|
|
# XXX: Backward compatibility
|
|
|
[ -x /rw/config/qubes_ip_change_hook ] && /rw/config/qubes_ip_change_hook
|