From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 29 Jan 2024 12:06:25 +0000 (+0000)
Subject: ts-xen-install: Fix bridge setup, ask to copy MAC addr
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=415e14b1e8d4896f7356c690971a8164ef9a4fed;p=osstest.git

ts-xen-install: Fix bridge setup, ask to copy MAC addr

This ask to copy the MAC address from $physif on the bridge.

On Debian Bookworm, when running as a Xen guest for nested tests, the
bridge does get a random MAC address and a different IP address from
DHCP than before setting up the bridge, so the test fails.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
---

diff --git a/ts-xen-install b/ts-xen-install
index 3a913fc..645d8a7 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -312,6 +312,9 @@ sub ensurebridge () {
     bridge_ports $physif
     bridge_fd 0
     bridge_stp off
+END
+            $bridgex .= <<END if ($ho->{Suite} !~ m/wheezy|jessie|stretch|buster/);
+    bridge_hw $physif
 END
 	} else {
 	    $iface= $physif;