From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 7 Nov 2019 14:15:21 +0000 (+0100)
Subject: TEST-{20,50,60,70): set MACAddressPolicy=keep
X-Git-Tag: 050~88
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fdracut.git;a=commitdiff_plain;h=f3f081e5420f70481aa00772137b10d411364dd2

TEST-{20,50,60,70): set MACAddressPolicy=keep

New systemd defaults to generating MAC addresses for software devices (whereas
previously they would inherit them from the first enslaved slave).

Sadly, among the things this breaks is our test fixture, where the dhcp servers
are configured to expect a particular MAC address. Disable this for the
affected tests, which are essentially the ones that use bridges and bonds.
---

diff --git a/test/TEST-20-NFS/99-default.link b/test/TEST-20-NFS/99-default.link
new file mode 100644
index 000000000..b992bfd20
--- /dev/null
+++ b/test/TEST-20-NFS/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 4ad7fd770..b28337176 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -342,6 +342,7 @@ test_setup() {
         inst_hook shutdown-emergency 000 ./hard-off.sh
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image
diff --git a/test/TEST-50-MULTINIC/99-default.link b/test/TEST-50-MULTINIC/99-default.link
new file mode 100644
index 000000000..b992bfd20
--- /dev/null
+++ b/test/TEST-50-MULTINIC/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index ff2961dc9..fa7526380 100755
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -281,6 +281,7 @@ test_setup() {
         inst_hook shutdown-emergency 000 ./hard-off.sh
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image
diff --git a/test/TEST-60-IFCFG/99-default.link b/test/TEST-60-IFCFG/99-default.link
new file mode 100644
index 000000000..b992bfd20
--- /dev/null
+++ b/test/TEST-60-IFCFG/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep
diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh
index 8e8bd982d..73dc109e8 100755
--- a/test/TEST-60-IFCFG/test.sh
+++ b/test/TEST-60-IFCFG/test.sh
@@ -302,6 +302,7 @@ test_setup() {
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image
diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link b/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link
new file mode 100644
index 000000000..b992bfd20
--- /dev/null
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep
diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
index b6dd080c8..62582c31f 100755
--- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
@@ -302,6 +302,7 @@ test_setup() {
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image