From 325eff2b1310271644cb94c761673f69804a2dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Tue, 18 Jun 2019 16:07:36 +0200
Subject: [PATCH 1/7] Refactor and handle new network qubesdb configuration

---
 init/functions                           |  13 +-
 network/network-manager-prepare-conf-dir |   2 +
 network/setup-ip                         | 278 +++++++++++++++--------
 network/udev-qubes-network.rules         |   2 +-
 vm-systemd/misc-post.sh                  |   2 +-
 5 files changed, 203 insertions(+), 94 deletions(-)

diff --git a/init/functions b/init/functions
index 1c6a012..303ddb3 100644
--- a/init/functions
+++ b/init/functions
@@ -158,6 +158,17 @@ get_qubes_managed_iface() {
     fi
 }
 
+get_prefix_from_subnet() {
+    local subnet="$1"
+    prefix="$(ipcalc -p 0.0.0.0 "$subnet" | sed 's/PREFIX=//')"
+
+    if [ "x$prefix" != "x" ]; then
+        echo "$prefix"
+    else
+        echo "32"
+    fi
+}
+
 initialize_home() {
     local home_root
     local mode
@@ -225,4 +236,4 @@ initialize_home() {
         fi
         for waitpid in $waitpids ; do wait "$waitpid" ; done ; waitpids=
     done
-}
+}
\ No newline at end of file
diff --git a/network/network-manager-prepare-conf-dir b/network/network-manager-prepare-conf-dir
index e9e6231..3fd3027 100755
--- a/network/network-manager-prepare-conf-dir
+++ b/network/network-manager-prepare-conf-dir
@@ -24,7 +24,9 @@ sed -r -i -e "s/^#?plugins=.*/plugins=keyfile/" /etc/NetworkManager/NetworkManag
 # 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" ] &&
diff --git a/network/setup-ip b/network/setup-ip
index a7ec8f6..204ba5d 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -1,135 +1,231 @@
-#!/bin/sh
+#!/bin/bash
 
 # Source Qubes library.
 # shellcheck disable=SC1091
 . /usr/lib/qubes/init/functions
 
-have_qubesdb || exit 0
+configure_network() {
+    local IFS=','
+    read -r -a args <<< "$@"
 
-mac="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)"
-current_mac="$(get_mac_from_iface "$INTERFACE")"
+    local MAC="${args[0]}"
+    local INTERFACE="${args[1]}"
+    local ip="${args[2]}"
+    local ip6="${args[3]}"
+    local netmask="${args[4]}"
+    local netmask6="${args[5]}"
+    local gateway="${args[6]}"
+    local gateway6="${args[7]}"
+    local primary_dns="${args[8]}"
+    local secondary_dns="${args[9]}"
 
-if [ "$mac" = "$current_mac" ] || [ "x$mac" = "x" ] ; then
-    ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)"
-    ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)"
-    if [ "x$ip" != x ]; then
-        #netmask=$(/usr/bin/qubesdb-read /qubes-netmask)
-        gateway=$(/usr/bin/qubesdb-read /qubes-gateway)
-        gateway6=$(/usr/bin/qubesdb-read /qubes-gateway6)
-        primary_dns=$(/usr/bin/qubesdb-read /qubes-primary-dns 2>/dev/null || echo "$gateway")
-        secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns)
-        /sbin/ethtool -K "$INTERFACE" sg off
-        /sbin/ethtool -K "$INTERFACE" tx off
-        # If NetworkManager is enabled, let it configure the network
-        if qsvc network-manager ; then
-            nm_config="/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE"
-            cat > "$nm_config" <<__EOF__
+    /sbin/ifconfig "$INTERFACE" "$ip" netmask "$netmask"
+    if [ -n "$ip6" ]; then
+        /sbin/ifconfig "$INTERFACE" add "$ip6/$netmask6"
+    fi
+    /sbin/ifconfig "$INTERFACE" up
+
+    if [ -n "$gateway" ]; then
+        /sbin/route add -host "$gateway" dev "$INTERFACE"
+        if [ -n "$gateway6" ] && ! echo "$gateway6" | grep -q "^fe80:"; then
+            /sbin/route -6 add "$gateway6/$netmask6" dev "$INTERFACE"
+        fi
+        if ! qsvc disable-default-route ; then
+            /sbin/route add default gw "$gateway"
+            if [ -n "$gateway6" ]; then
+                /sbin/route -6 add default gw "$gateway6" dev "$INTERFACE"
+            fi
+        fi
+    fi
+
+    if [ -z "$primary_dns" ] && [ -n "$gateway" ]; then
+        primary_dns="$gateway"
+    fi
+
+    if ! is_protected_file /etc/resolv.conf ; then
+        echo > /etc/resolv.conf
+        if ! qsvc disable-dns-server ; then
+            echo "nameserver $primary_dns" > /etc/resolv.conf
+            echo "nameserver $secondary_dns" >> /etc/resolv.conf
+        fi
+    fi
+}
+
+configure_network_nm() {
+    local IFS=','
+    read -r -a args <<< "$@"
+
+    local MAC="${args[0]}"
+    local INTERFACE="${args[1]}"
+    local ip="${args[2]}"
+    local ip6="${args[3]}"
+    local netmask="${args[4]}"
+    local netmask6="${args[5]}"
+    local gateway="${args[6]}"
+    local gateway6="${args[7]}"
+    local primary_dns="${args[8]}"
+    local secondary_dns="${args[9]}"
+
+    local prefix
+    local prefix6
+    local nm_config
+    local ip4_nm_config
+    local ip6_nm_config
+    local uuid
+
+    prefix="$(get_prefix_from_subnet "$netmask")"
+    prefix6="$netmask6"
+    uuid="de85f79b-8c3d-405f-a652-${MAC//:/}"
+    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}')
+mac-address=$MAC
 
 [connection]
 id=VM uplink $INTERFACE
-uuid=de85f79b-8c3d-405f-a652-cb4c10b4f9ef
+uuid=$uuid
 type=802-3-ethernet
 __EOF__
-            ip4_nm_config=""
-            ip6_nm_config=""
-            if ! qsvc disable-dns-server ; then
-                ip4_nm_config="${ip4_nm_config}
+    ip4_nm_config=""
+    ip6_nm_config=""
+    if ! qsvc disable-dns-server ; then
+        ip4_nm_config="${ip4_nm_config}
 dns=${primary_dns};${secondary_dns}"
-            fi
-            if ! qsvc disable-default-route ; then
-                ip4_nm_config="${ip4_nm_config}
-addresses1=$ip;32;$gateway"
-                if [ -n "$ip6" ]; then
-                    ip6_nm_config="${ip6_nm_config}
-addresses1=$ip6;128;$gateway6"
-                fi
-            else
-                ip4_nm_config="${ip4_nm_config}
-addresses1=$ip;32"
-                if [ -n "$ip6" ]; then
-                    ip6_nm_config="${ip6_nm_config}
-addresses1=$ip6;128"
-                fi
-            fi
-            if [ -n "$ip4_nm_config" ]; then
-                cat >> "$nm_config" <<__EOF__
+    fi
+    if ! qsvc disable-default-route ; then
+        ip4_nm_config="${ip4_nm_config}
+addresses1=$ip;$prefix;$gateway"
+        if [ -n "$ip6" ]; then
+            ip6_nm_config="${ip6_nm_config}
+addresses1=$ip6;$prefix6;$gateway6"
+        fi
+    else
+        ip4_nm_config="${ip4_nm_config}
+addresses1=$ip;$prefix"
+        if [ -n "$ip6" ]; then
+            ip6_nm_config="${ip6_nm_config}
+addresses1=$ip6;$prefix6"
+        fi
+    fi
+    if [ -n "$ip4_nm_config" ]; then
+        cat >> "$nm_config" <<__EOF__
 [ipv4]
 method=manual
 may-fail=false
 $ip4_nm_config
 __EOF__
-            else
-                cat >> "$nm_config" <<__EOF__
+    else
+        cat >> "$nm_config" <<__EOF__
 [ipv4]
 method=ignore
 __EOF__
-            fi
+    fi
 
-            if [ -n "$ip6_nm_config" ]; then
-                cat >> "$nm_config" <<__EOF__
+    if [ -n "$ip6_nm_config" ]; then
+        cat >> "$nm_config" <<__EOF__
 [ipv6]
 method=manual
 may-fail=false
 $ip6_nm_config
 __EOF__
-            else
-                cat >> "$nm_config" <<__EOF__
+    else
+        cat >> "$nm_config" <<__EOF__
 [ipv6]
 method=ignore
 __EOF__
+    fi
+
+    chmod 600 "$nm_config"
+    # reload connection
+    nmcli connection load "$nm_config" || :
+}
+
+configure_qubes_ns() {
+    gateway=$(qubesdb-read /qubes-netvm-gateway)
+    #netmask=$(qubesdb-read /qubes-netvm-netmask)
+    primary_dns=$(qubesdb-read /qubes-netvm-primary-dns 2>/dev/null || echo "$gateway")
+    secondary_dns=$(qubesdb-read /qubes-netvm-secondary-dns)
+    echo "NS1=$primary_dns" > /var/run/qubes/qubes-ns
+    echo "NS2=$secondary_dns" >> /var/run/qubes/qubes-ns
+    /usr/lib/qubes/qubes-setup-dnat-to-ns
+}
+
+qubes_ip_change_hook() {
+    if [ -x /rw/config/qubes-ip-change-hook ]; then
+        /rw/config/qubes-ip-change-hook
+    fi
+    # XXX: Backward compatibility
+    if [ -x /rw/config/qubes_ip_change_hook ]; then
+        /rw/config/qubes_ip_change_hook
+    fi
+}
+
+have_qubesdb || exit 0
+
+if [ -n "$INTERFACE" ]; then
+    if [ "$ACTION" == "add" ]; then
+        MAC="$(get_mac_from_iface "$INTERFACE")"
+        if [ -n "$MAC" ]; then
+            ip="$(/usr/bin/qubesdb-read "/net-config/$MAC/ip" 2> /dev/null)"
+            ip6="$(/usr/bin/qubesdb-read "/net-config/$MAC/ip6" 2> /dev/null)"
+            netmask="$(/usr/bin/qubesdb-read "/net-config/$MAC/netmask" 2> /dev/null)"
+            netmask6="$(/usr/bin/qubesdb-read "/net-config/$MAC/netmask6" 2> /dev/null)"
+            gateway="$(/usr/bin/qubesdb-read "/net-config/$MAC/gateway" 2> /dev/null)"
+            gateway6="$(/usr/bin/qubesdb-read "/net-config/$MAC/gateway6" 2> /dev/null)"
+
+            # Handle legacy values
+            LEGACY_MAC="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)"
+            if [ "$MAC" == "$LEGACY_MAC" ]; then
+                if [ "x$ip" == "x" ]; then
+                    ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)"
+                fi
+                if [ "$ip6" == "x" ]; then
+                    ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)"
+                fi
+                if [ "$gateway" == "x" ]; then
+                    gateway="$(/usr/bin/qubesdb-read /qubes-gateway)"
+                fi
+                if [ "x$gateway6" == "x" ]; then
+                    gateway6="$(/usr/bin/qubesdb-read /qubes-gateway6)"
+                fi
             fi
 
-            chmod 600 "$nm_config"
-            # reload connection
-            nmcli connection load "$nm_config" || :
-        else
-            # No NetworkManager enabled, configure the network manually
-            /sbin/ifconfig "$INTERFACE" "$ip" netmask 255.255.255.255
-            if [ -n "$ip6" ]; then
-                /sbin/ifconfig "$INTERFACE" add "$ip6"/128
+            if [ "x$netmask" == "x" ]; then
+                netmask="255.255.255.255"
             fi
-            /sbin/ifconfig "$INTERFACE" up
-            /sbin/route add -host "$gateway" dev "$INTERFACE"
-            if [ -n "$gateway6" ] && ! echo "$gateway6" | grep -q "^fe80:"; then
-                /sbin/route -6 add "$gateway6/128" dev "$INTERFACE"
+            if [ "x$netmask6" == "x" ]; then
+                netmask6="128"
             fi
-            if ! qsvc disable-default-route ; then
-                /sbin/route add default gw "$gateway"
-                if [ -n "$gateway6" ]; then
-                    /sbin/route -6 add default gw "$gateway6" dev "$INTERFACE"
+
+            primary_dns=$(/usr/bin/qubesdb-read /qubes-primary-dns 2>/dev/null)
+            secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns 2>/dev/null)
+
+            if [ -n "$ip" ]; then
+                /sbin/ethtool -K "$INTERFACE" sg off
+                /sbin/ethtool -K "$INTERFACE" tx off
+
+                # If NetworkManager is enabled, let it configure the network
+                if qsvc network-manager ; then
+                    configure_network_nm "$MAC","$INTERFACE","$ip","$ip6","$netmask","$netmask6","$gateway","$gateway6","$primary_dns","$secondary_dns"
+                else
+                    configure_network "$MAC","$INTERFACE","$ip","$ip6","$netmask","$netmask6","$gateway","$gateway6","$primary_dns","$secondary_dns"
                 fi
-            fi
-            if ! is_protected_file /etc/resolv.conf ; then
-                echo > /etc/resolv.conf
-                if ! qsvc disable-dns-server ; then
-                    echo "nameserver $primary_dns" > /etc/resolv.conf
-                    echo "nameserver $secondary_dns" >> /etc/resolv.conf
+
+                network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
+                if [ "x$network" != "x" ]; then
+                    if ! qsvc disable-dns-server; then
+                        configure_qubes_ns
+                    fi
+                    qubes_ip_change_hook
                 fi
             fi
         fi
-        network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
-        if [ "x$network" != "x" ] && ! qsvc disable-dns-server ; then
-            gateway=$(qubesdb-read /qubes-netvm-gateway)
-            #netmask=$(qubesdb-read /qubes-netvm-netmask)
-            primary_dns=$(qubesdb-read /qubes-netvm-primary-dns 2>/dev/null || echo "$gateway")
-            secondary_dns=$(qubesdb-read /qubes-netvm-secondary-dns)
-            echo "NS1=$primary_dns" > /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
-            if [ -x /rw/config/qubes-ip-change-hook ]; then
-                /rw/config/qubes-ip-change-hook
-            fi
-            # XXX: Backward compatibility
-            if [ -x /rw/config/qubes_ip_change_hook ]; then
-                /rw/config/qubes_ip_change_hook
-            fi
-        fi
+    elif [ "$ACTION" == "remove" ]; then
+        # If exists, we delete NetworkManager configuration file to prevent duplicate entries
+        nm_config="/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE"
+        rm -rf "$nm_config"
     fi
 fi
diff --git a/network/udev-qubes-network.rules b/network/udev-qubes-network.rules
index 2db6344..0ae83b2 100644
--- a/network/udev-qubes-network.rules
+++ b/network/udev-qubes-network.rules
@@ -1,5 +1,5 @@
-
 # old udev has ENV{ID_NET_DRIVER}
 SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", ENV{ID_NET_DRIVER}=="vif", RUN+="/usr/lib/qubes/setup-ip"
+SUBSYSTEMS=="net", KERNEL=="eth*", ACTION=="remove", ENV{ID_NET_DRIVER}=="vif", RUN+="/usr/lib/qubes/setup-ip"
 # new udev has DRIVERS
 SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", DRIVERS=="vif", RUN+="/usr/lib/qubes/setup-ip"
diff --git a/vm-systemd/misc-post.sh b/vm-systemd/misc-post.sh
index 0533013..f284efd 100755
--- a/vm-systemd/misc-post.sh
+++ b/vm-systemd/misc-post.sh
@@ -17,7 +17,7 @@ fi
 # qubesdb-read fails
 QUBES_MANAGED_IFACE="$(get_qubes_managed_iface)"
 if [ "x$QUBES_MANAGED_IFACE" != "x" ]; then
-INTERFACE="$QUBES_MANAGED_IFACE" /usr/lib/qubes/setup-ip
+INTERFACE="$QUBES_MANAGED_IFACE" ACTION="add" /usr/lib/qubes/setup-ip
 fi
 
 if [ -x /rw/config/rc.local ] ; then

From 1c5410166320ff55a25b8675b8ee2c6342d6d9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Wed, 19 Jun 2019 19:21:38 +0200
Subject: [PATCH 2/7] Handle legacy non-present /qubes-mac qubesdb entry

---
 network/setup-ip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network/setup-ip b/network/setup-ip
index 204ba5d..f7ae533 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -178,7 +178,7 @@ if [ -n "$INTERFACE" ]; then
 
             # Handle legacy values
             LEGACY_MAC="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)"
-            if [ "$MAC" == "$LEGACY_MAC" ]; then
+            if [ "$MAC" == "$LEGACY_MAC" ] || [ "x$LEGACY_MAC" == "x" ]; then
                 if [ "x$ip" == "x" ]; then
                     ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)"
                 fi

From aa7ab25a783495293c9fc738565600757dd6f0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Wed, 19 Jun 2019 21:03:54 +0200
Subject: [PATCH 3/7] configure_network: use classical function parsing

---
 network/setup-ip | 50 +++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/network/setup-ip b/network/setup-ip
index f7ae533..cace94c 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -5,19 +5,16 @@
 . /usr/lib/qubes/init/functions
 
 configure_network() {
-    local IFS=','
-    read -r -a args <<< "$@"
-
-    local MAC="${args[0]}"
-    local INTERFACE="${args[1]}"
-    local ip="${args[2]}"
-    local ip6="${args[3]}"
-    local netmask="${args[4]}"
-    local netmask6="${args[5]}"
-    local gateway="${args[6]}"
-    local gateway6="${args[7]}"
-    local primary_dns="${args[8]}"
-    local secondary_dns="${args[9]}"
+    local MAC="$1"
+    local INTERFACE="$2"
+    local ip="$3"
+    local ip6="$4"
+    local netmask="$5"
+    local netmask6="$6"
+    local gateway="$7"
+    local gateway6="$8"
+    local primary_dns="$9"
+    local secondary_dns="${10}"
 
     /sbin/ifconfig "$INTERFACE" "$ip" netmask "$netmask"
     if [ -n "$ip6" ]; then
@@ -52,19 +49,16 @@ configure_network() {
 }
 
 configure_network_nm() {
-    local IFS=','
-    read -r -a args <<< "$@"
-
-    local MAC="${args[0]}"
-    local INTERFACE="${args[1]}"
-    local ip="${args[2]}"
-    local ip6="${args[3]}"
-    local netmask="${args[4]}"
-    local netmask6="${args[5]}"
-    local gateway="${args[6]}"
-    local gateway6="${args[7]}"
-    local primary_dns="${args[8]}"
-    local secondary_dns="${args[9]}"
+    local MAC="$1"
+    local INTERFACE="$2"
+    local ip="$3"
+    local ip6="$4"
+    local netmask="$5"
+    local netmask6="$6"
+    local gateway="$7"
+    local gateway6="$8"
+    local primary_dns="$9"
+    local secondary_dns="${10}"
 
     local prefix
     local prefix6
@@ -209,9 +203,9 @@ if [ -n "$INTERFACE" ]; then
 
                 # If NetworkManager is enabled, let it configure the network
                 if qsvc network-manager ; then
-                    configure_network_nm "$MAC","$INTERFACE","$ip","$ip6","$netmask","$netmask6","$gateway","$gateway6","$primary_dns","$secondary_dns"
+                    configure_network_nm "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns"
                 else
-                    configure_network "$MAC","$INTERFACE","$ip","$ip6","$netmask","$netmask6","$gateway","$gateway6","$primary_dns","$secondary_dns"
+                    configure_network "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns"
                 fi
 
                 network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)

From 967060eb32822ecebff5c8b6312db15eae3c0fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Thu, 20 Jun 2019 16:06:25 +0200
Subject: [PATCH 4/7] init/functions: handle non-present /qubes-mac qubesdb and
 check if iface exists

---
 init/functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init/functions b/init/functions
index 303ddb3..d4cbdcf 100644
--- a/init/functions
+++ b/init/functions
@@ -131,7 +131,7 @@ umount_retry() {
 get_mac_from_iface() {
     local iface="$1"
     local mac
-    if [ "x$iface" != "x" ]; then
+    if [ "x$iface" != "x" ] && [ -e "/sys/class/net/$iface" ]; then
         mac="$(cat "/sys/class/net/$iface/address")"
     fi
     echo "$mac"
@@ -149,7 +149,7 @@ get_iface_from_mac() {
 get_qubes_managed_iface() {
     local mac
     local qubes_iface
-    mac="$(qubesdb-read /qubes-mac)"
+    mac="$(qubesdb-read /qubes-mac 2> /dev/null)"
     qubes_iface="$(get_iface_from_mac "$mac")"
     if [ "x$qubes_iface" != "x" ]; then
         echo "$qubes_iface"
@@ -236,4 +236,4 @@ initialize_home() {
         fi
         for waitpid in $waitpids ; do wait "$waitpid" ; done ; waitpids=
     done
-}
\ No newline at end of file
+}

From cf03ae3e2a65e8a7d80514812c5880c5e8d4c3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Thu, 20 Jun 2019 16:32:08 +0200
Subject: [PATCH 5/7] Better use '-z' and '-n' for readibility

---
 network/setup-ip | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/network/setup-ip b/network/setup-ip
index cace94c..8c8a613 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -172,25 +172,25 @@ if [ -n "$INTERFACE" ]; then
 
             # Handle legacy values
             LEGACY_MAC="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)"
-            if [ "$MAC" == "$LEGACY_MAC" ] || [ "x$LEGACY_MAC" == "x" ]; then
-                if [ "x$ip" == "x" ]; then
+            if [ "$MAC" == "$LEGACY_MAC" ] || [ -z "$LEGACY_MAC" ]; then
+                if [ -z "$ip" ]; then
                     ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)"
                 fi
-                if [ "$ip6" == "x" ]; then
+                if [ -z "$ip6" ]; then
                     ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)"
                 fi
-                if [ "$gateway" == "x" ]; then
+                if [ -z "$gateway" ]; then
                     gateway="$(/usr/bin/qubesdb-read /qubes-gateway)"
                 fi
-                if [ "x$gateway6" == "x" ]; then
+                if [ -z "$gateway6" ]; then
                     gateway6="$(/usr/bin/qubesdb-read /qubes-gateway6)"
                 fi
             fi
 
-            if [ "x$netmask" == "x" ]; then
+            if [ -z "$netmask" ]; then
                 netmask="255.255.255.255"
             fi
-            if [ "x$netmask6" == "x" ]; then
+            if [ -z "$netmask6" ]; then
                 netmask6="128"
             fi
 
@@ -209,7 +209,7 @@ if [ -n "$INTERFACE" ]; then
                 fi
 
                 network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
-                if [ "x$network" != "x" ]; then
+                if [ -n "$network" ]; then
                     if ! qsvc disable-dns-server; then
                         configure_qubes_ns
                     fi

From dba1020b4c4a3708e29a5726f491cce9f69e0ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Sat, 22 Jun 2019 17:40:20 +0200
Subject: [PATCH 6/7] Handle errors for non-present ip gateways

---
 network/setup-ip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/network/setup-ip b/network/setup-ip
index 8c8a613..6f87d37 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -180,10 +180,10 @@ if [ -n "$INTERFACE" ]; then
                     ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)"
                 fi
                 if [ -z "$gateway" ]; then
-                    gateway="$(/usr/bin/qubesdb-read /qubes-gateway)"
+                    gateway="$(/usr/bin/qubesdb-read /qubes-gateway 2> /dev/null)"
                 fi
                 if [ -z "$gateway6" ]; then
-                    gateway6="$(/usr/bin/qubesdb-read /qubes-gateway6)"
+                    gateway6="$(/usr/bin/qubesdb-read /qubes-gateway6 2> /dev/null)"
                 fi
             fi
 

From 3f5dc53d75d3acc5d9324e382034f65ce25cbfca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Sat, 22 Jun 2019 18:05:45 +0200
Subject: [PATCH 7/7] init/functions: better not use ipcalc which is not
 present on minimal distro

---
 init/functions | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/init/functions b/init/functions
index d4cbdcf..7b99599 100644
--- a/init/functions
+++ b/init/functions
@@ -158,9 +158,13 @@ get_qubes_managed_iface() {
     fi
 }
 
+# Based on: https://forums.gentoo.org/viewtopic-t-888736-start-0.html
 get_prefix_from_subnet() {
     local subnet="$1"
-    prefix="$(ipcalc -p 0.0.0.0 "$subnet" | sed 's/PREFIX=//')"
+    local x=${subnet##*255.}
+    set -- 0^^^128^192^224^240^248^252^254^ $(( (${#1} - ${#x})*2 )) "${x%%.*}"
+    x=${1%%$3*}
+    prefix=$(( $2 + (${#x}/4) ))
 
     if [ "x$prefix" != "x" ]; then
         echo "$prefix"