chore: DRY configure_qubes_ns

Author: 3np

init/functions

@@ -115,6 +115,25 @@ umount_retry() {
     return 0
 }
 
+configure_qubes_ns() {
+    get_nameserver_config > /var/run/qubes/qubes-ns
+    /usr/lib/qubes/qubes-setup-dnat-to-ns
+}
+
+get_nameserver_config() {
+  primary_dns=$(qubesdb-read /qubes-netvm-primary-dns 2>/dev/null || qubesdb-read /qubes-netvm-gateway)
+  secondary_dns=$(qubesdb-read /qubes-netvm-secondary-dns ||:)
+  primary_dns6=$(qubesdb-read /qubes-netvm-primary-dns6 ||:)
+  secondary_dns6=$(qubesdb-read /qubes-netvm-secondary-dns6 ||:)
+  i=1
+  for ns in "${primary_dns}" "${secondary_dns}" "${primary_dns6}" "${secondary_dns6}"; do
+      if [ -n "${ns}" ]; then
+          echo "NS${i}=${ns}"
+          i="$(( i+1 ))"
+      fi
+  done
+}
+
 get_mac_from_iface() {
     local iface="$1"
     local mac=

network/setup-ip

@@ -191,29 +191,6 @@ __EOF__
     fi
 }
 
-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)
-    primary_dns6=$(qubesdb-read /qubes-netvm-primary-dns6 ||:)
-    secondary_dns6=$(qubesdb-read /qubes-netvm-secondary-dns6 ||:)
-    if [ -n "$primary_dns6" ]; then
-        cat > /var/run/qubes/qubes-ns<< EOF
-NS1=$primary_dns6
-NS2=$secondary_dns6
-NS3=$primary_dns
-NS4=$secondary_dns
-EOF
-    else
-        cat > /var/run/qubes/qubes-ns<< EOF
-NS1=$primary_dns
-NS2=$secondary_dns
-EOF
-    fi
-    /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

vm-systemd/network-proxy-setup.sh

@@ -14,28 +14,12 @@ if [ -n "${network}" ]; then
         readonly modprobe_fail_cmd='false'
     fi
 
-    gateway=$(qubesdb-read /qubes-netvm-gateway)
-    gateway6=$(qubesdb-read /qubes-netvm-gateway6 ||:)
-    #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 ||:)
-    primary_dns6=$(qubesdb-read /qubes-netvm-primary-dns6 ||:)
-    secondary_dns6=$(qubesdb-read /qubes-netvm-secondary-dns6 ||:)
-    gen_ns_spec() {
-        i=1
-        for ns in "${primary_dns}" "${secondary_dns}" "${primary_dns6}" "${secondary_dns6}"; do
-            if [ -n "${ns}" ]; then
-                echo "NS${i}=${ns}"
-                i="$(( i+1 ))"
-            fi
-        done
-    }
     modprobe netbk 2> /dev/null || modprobe xen-netback || "${modprobe_fail_cmd}"
-    gen_ns_spec > /var/run/qubes/qubes-ns
-    /usr/lib/qubes/qubes-setup-dnat-to-ns
+    configure_qubes_ns
 
     echo "1" > /proc/sys/net/ipv4/ip_forward
     # enable also IPv6 forwarding, if IPv6 is enabled
+    gateway6=$(qubesdb-read /qubes-netvm-gateway6 ||:)
     if [ -n "$gateway6" ]; then
         echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
     fi