Skip to content

Commit e5d626b

Browse files
committed
Merge remote-tracking branch 'origin/pr/597'
* origin/pr/597: network: remove redundant qubesdb-read calls and /run/qubes/qubes-ns Pull request description: The file `/var/run/qubes/qubes-ns` is not used since the transition to nftables (https://github.com/QubesOS/qubes-core-agent-linux/pull/407/files#diff-1e7c156682261fecd8a773620728327528f3be00468837709d7ffeb8073cc602L17). Remove it and the associated now redundant `qubesdb-read` calls. `qubes-ns` is also no longer used in qubes-whonix: Whonix/qubes-whonix@451b784
2 parents 84b3889 + 01a1e05 commit e5d626b

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

network/setup-ip

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ __EOF__
179179
}
180180

181181
configure_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"

vm-systemd/network-proxy-setup.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@ if [ -n "${network}" ]; 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

0 commit comments

Comments
 (0)