preseed_base: Use "keep" NIC NamePolicy when "force-mac-address"

We have a few machine (arndale-*) that have a nic without mac address,
so the kernel assign a random one. For those there's a flags
"force-mac-address" which tells osstest to make it so that the machine
changes the mac address to a predefined one at boot. This normally
tells systemd rules to not use the mac address to rename the network
interface as it a temporary mac, but that doesn't always work.
(Machine installed by osstest should use the mac namepolicy otherwise,
since 367166c32329 ("preseed_base, ts-host-install: Change NIC
NamePolicy to "mac"")).

Often, on the branch "linux-linus", so with more recent version of
Linux, the network interface gets renamed sometime with the "mac"
namepolicy which break networking. These are the kernel messages when
the rename happen:

> usb 1-3.2.4: new high-speed USB device number 4 using exynos-ehci
> asix 1-3.2.4:1.0 (unnamed net_device) (uninitialized): invalid hw address, using random
> asix 1-3.2.4:1.0 (unnamed net_device) (uninitialized): PHY [usb-001:004:10] driver [Asix Electronics AX88772A] (irq=POLL)
> asix 1-3.2.4:1.0 eth0: register 'asix' at usb-12110000.usb-3.2.4, ASIX AX88772 USB 2.0 Ethernet, 06:85:e5:95:f0:7c
> usbcore: registered new device driver onboard-usb-dev
> usb 1-3.2.4: USB disconnect, device number 4
> asix 1-3.2.4:1.0 eth0: unregister 'asix' usb-12110000.usb-3.2.4, ASIX AX88772 USB 2.0 Ethernet
> hub 1-3.2:1.0: USB hub found
> hub 1-3.2:1.0: 4 ports detected
> hub 1-3.2:1.0: USB hub found
> hub 1-3.2:1.0: 4 ports detected
> usb 1-3.2.4: new high-speed USB device number 5 using exynos-ehci
> asix 1-3.2.4:1.0 (unnamed net_device) (uninitialized): PHY [usb-001:005:10] driver [Asix Electronics AX88772A] (irq=POLL)
> Asix Electronics AX88772A usb-001:005:10: attached PHY driver (mii_bus:phy_addr=usb-001:005:10, irq=POLL)
> asix 1-3.2.4:1.0 eth0: register 'asix' at usb-12110000.usb-3.2.4, ASIX AX88772 USB 2.0 Ethernet, 06:85:e5:95:f0:7c
> asix 1-3.2.4:1.0 enx0685e595f07c: renamed from eth0

The "xenbr0" bridge is setup to use "eth0", because that was the name
of the nic during setup, so with a new name for the main interface the
bridge doesn't work.

In order to avoid the issue, we will use the NamePolicy "keep" when
there is a flag "force-mac-address", which keep the original name of
the interface (eth0). That flags only works if there's a single
network interface, so we can expect "eth0" to always be the same
interface.

Even if the problem so far exhibit only at runtime after rebooting
under Xen (which is fixed by a change in preseed_base()), we will also
add the policy change to the installer (change in ts-host-install), to
be future proof.

(The filename of the policy is to have it apply before
"73-usb-net-by-mac.link" that is installed on the system.)

Signed-off-by: Anthony PERARD <anthony.perard@vates.tech>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 3545f3fd678ab25b1e769a4a3822a3c0fafd6c47..e617ae16929be0fe63c2b00ded7580116699f903 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -972,7 +972,19 @@ END
         # is going to be added to dom0's initrd, which is used by some guests
         # (created with ts-debian-install).
         preseed_hook_installscript($ho, $sfx,
-            '/usr/lib/base-installer.d/', '05ifnamepolicy', <<'END');
+            '/usr/lib/base-installer.d/', '05ifnamepolicy',
+            $ho->{Flags}{'force-mac-address'} ? <<'END_KEEP' : <<'END_MAC');
+#!/bin/sh -e
+linkfile=/target/etc/systemd/network/70-eth-keep-policy.link
+mkdir -p `dirname $linkfile`
+cat > $linkfile <<EOF
+[Match]
+Type=ether
+Driver=!vif
+[Link]
+NamePolicy=keep
+EOF
+END_KEEP
 #!/bin/sh -e
 linkfile=/target/etc/systemd/network/90-eth-mac-policy.link
 mkdir -p `dirname $linkfile`
@@ -983,7 +995,7 @@ Driver=!vif
 [Link]
 NamePolicy=mac
 EOF
-END
+END_MAC
     }
 
     debian_overlays($ho, sub {

diff --git a/ts-host-install b/ts-host-install
index 0b6aaeeae228551064618abfa624321992a2eb2d..fbbfeecc209c78e30e634bc0a2e22f91a2d43a2a 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -248,7 +248,21 @@ END
     print CANARY "\n# - canary - came via initramfs\n" or die $!;
     close CANARY or die $!;
 
-    if ($ho->{Suite} !~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) {
+    if ($ho->{Flags}{'force-mac-address'}) {
+        # When we have to set a MAC address, make sure that the interface keep
+        # the original name that the kernel give, "eth0". There should only be
+        # one interface in the ysstem in this case, so no risk of mixup.
+        system_checked(qw(mkdir -p --), "$initrd_overlay.d/lib/systemd/network");
+        file_simple_write_contents
+            ("$initrd_overlay.d/lib/systemd/network/70-eth-keep-policy.link",
+                <<END);
+[Match]
+Type=ether
+Driver=!vif
+[Link]
+NamePolicy=keep
+END
+    } elsif ($ho->{Suite} !~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) {
         # Switch to more predictale nic name based on mac address, instead of the
         # policy "onboard" which can try to set the same name ("eno1") to two
         # differents nic, or "slot". New names are "enx$mac".