From fa66724a4aa1af5a2d8fed80afaf68bbd247814b Mon Sep 17 00:00:00 2001
From: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Mon, 20 Dec 2021 21:09:30 -0500
Subject: [PATCH] Remove the $mac variable from vif-route-qubes

It was used to add appropriate neighbor entries, but Qubes OS no longer
does that.  Hard-code a reasonable value in vif-qubes-nat.
---
 network/vif-qubes-nat.sh | 2 +-
 network/vif-route-qubes  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/network/vif-qubes-nat.sh b/network/vif-qubes-nat.sh
index 8299bc886..2c85f1cc7 100755
--- a/network/vif-qubes-nat.sh
+++ b/network/vif-qubes-nat.sh
@@ -26,7 +26,7 @@ netns_appvm_if="${vif}"
 #               '----------------------------------'
 #
 
-readonly netvm_mac=fe:ff:ff:ff:ff:ff
+readonly netvm_mac=fe:ff:ff:ff:ff:ff mac=00:16:3e:5e:6c:00
 
 function run
 {
diff --git a/network/vif-route-qubes b/network/vif-route-qubes
index 68b03d656..ffb7b157e 100755
--- a/network/vif-route-qubes
+++ b/network/vif-route-qubes
@@ -121,8 +121,6 @@ case "$command" in
         iptables_cmd='-I PREROUTING 1'
         cmdprefix=''
         ipv6_disabled=$(cat "/proc/sys/net/ipv6/conf/$vif/disable_ipv6" || echo 1)
-        # without a MAC address we will fail later with a confusing error
-        mac=$(xenstore-read "backend/vif/$domid/$sub/mac") || exit 1
         ;;
     offline)
         do_without_error ifdown "${vif}"