Copy all .link interface naming definitions to initramfs

Currently, only the default .link files from /lib/systemd/network are
copied to the initramfs, meaning, that additional (local) .link naming
definitions will be ignored when the system is still controlled by the
initramfs and interfaces might get wrong names.

Fix this by copying all .link files from /lib/systemd/network and
/etc/systemd/network into the initramfs, with the files from
/etc/systemd/network taking precedence over files with the same name
from /lib/systemd/network, as stated in the systemd.link manpage.

Closes: #793374

diff --git a/debian/changelog b/debian/changelog
index fb4e61eb8e8c8203d9dbba288b8b853cb6d00b65..1750c5155392137d0f890f9b482c4311cbb0e85d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ systemd (222-3) UNRELEASED; urgency=medium
     This avoids blocking network.target on boot with unavailable hotplug
     interfaces in /etc/network/interfaces. (Closes: #790669, LP: #1425376)
 
+  [ Julian Wollrath ]
+  * Copy all .link interface naming definitions to initramfs. (Closes: #793374)
+
  -- Michael Biebl <biebl@debian.org>  Tue, 21 Jul 2015 22:24:51 +0200
 
 systemd (222-2) unstable; urgency=medium

diff --git a/debian/extra/initramfs-tools/hooks/udev b/debian/extra/initramfs-tools/hooks/udev
index cfe5085ae079fbcf3ec75ce493df5b8fe906f04e..583465f9d87ea73359a1e72df09fdf4bdadf3069 100755 (executable)
--- a/debian/extra/initramfs-tools/hooks/udev
+++ b/debian/extra/initramfs-tools/hooks/udev
@@ -32,14 +32,9 @@ cp -a /sbin/udevadm $DESTDIR/sbin/udevadm
 mkdir -p $DESTDIR/etc/udev
 cp -p /etc/udev/udev.conf $DESTDIR/etc/udev/
 
+# copy .link files containing interface naming definitions
 mkdir -p $DESTDIR/lib/systemd/network/
-for link in 01-mac-for-usb.link 99-default.link; do
-  if   [ -e /etc/systemd/network/$link ]; then
-    cp -p /etc/systemd/network/$link $DESTDIR/lib/systemd/network/
-  elif [ -e /lib/systemd/network/$link ]; then
-    cp -p /lib/systemd/network/$link $DESTDIR/lib/systemd/network/
-  fi
-done
+find /lib/systemd/network /etc/systemd/network -name '*.link' -execdir cp -pt $DESTDIR/lib/systemd/network/ '{}' +
 
 mkdir -p $DESTDIR/lib/udev/rules.d/
 for rules in 50-firmware.rules 50-udev-default.rules 60-persistent-storage.rules \