Skip to content

Commit

Permalink
Remove the $mac variable from vif-route-qubes
Browse files Browse the repository at this point in the history
It was used to add appropriate neighbor entries, but Qubes OS no longer
does that.  Hard-code a reasonable value in vif-qubes-nat.
  • Loading branch information
DemiMarie committed Jan 7, 2022
1 parent 16e24fe commit fa66724
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion network/vif-qubes-nat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions network/vif-route-qubes
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit fa66724

Please sign in to comment.