File tree Expand file tree Collapse file tree 2 files changed +1
-13
lines changed
Expand file tree Collapse file tree 2 files changed +1
-13
lines changed Original file line number Diff line number Diff line change @@ -179,12 +179,6 @@ __EOF__
179179}
180180
181181configure_qubes_ns () {
182- gateway=$( qubesdb-read /qubes-netvm-gateway)
183- # netmask=$(qubesdb-read /qubes-netvm-netmask)
184- primary_dns=$( qubesdb-read /qubes-netvm-primary-dns 2> /dev/null || echo " $gateway " )
185- secondary_dns=$( qubesdb-read /qubes-netvm-secondary-dns)
186- echo " NS1=$primary_dns " > /var/run/qubes/qubes-ns
187- echo " NS2=$secondary_dns " >> /var/run/qubes/qubes-ns
188182 ret=0
189183 /usr/lib/qubes/qubes-setup-dnat-to-ns || ret=$?
190184 [ " $ret " -eq 0 ] || [ " $ret " -eq 100 ] || exit " $ret "
Original file line number Diff line number Diff line change @@ -14,17 +14,11 @@ if [ "x$network" != "x" ]; then
1414 readonly modprobe_fail_cmd=' false'
1515 fi
1616
17- gateway=$( qubesdb-read /qubes-netvm-gateway)
18- gateway6=$( qubesdb-read /qubes-netvm-gateway6 || :)
19- # netmask=$(qubesdb-read /qubes-netvm-netmask)
20- primary_dns=$( qubesdb-read /qubes-netvm-primary-dns 2> /dev/null || echo " $gateway " )
21- secondary_dns=$( qubesdb-read /qubes-netvm-secondary-dns)
2217 modprobe netbk 2> /dev/null || modprobe xen-netback || " ${modprobe_fail_cmd} "
23- echo " NS1=$primary_dns " > /var/run/qubes/qubes-ns
24- echo " NS2=$secondary_dns " >> /var/run/qubes/qubes-ns
2518 /usr/lib/qubes/qubes-setup-dnat-to-ns
2619 echo " 1" > /proc/sys/net/ipv4/ip_forward
2720 # enable also IPv6 forwarding, if IPv6 is enabled
21+ gateway6=$( qubesdb-read /qubes-netvm-gateway6 || :)
2822 if [ -n " $gateway6 " ]; then
2923 echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
3024 fi
You can’t perform that action at this time.
0 commit comments