Hi, Michael Biebl <bi...@debian.org> (2015-07-16): > Am 15.07.2015 um 19:08 schrieb Martin Pitt: > > Cyril Brulebois [2015-07-15 18:03 +0200]: > >> Bottom line(s): > >> --------------- > >> I'll be testing 221-1 to make sure I reproduce the issue with a full > >> install, then 221-1 + two patches to make sure it goes away. If that > >> works fine, it might be a good idea to tpu 221-1+deb9u1 so that we > >> get d-i Stretch Alpha 1 unstuck ASAP, while not having to figure out > >> what new joy the 222 release would bring.
Testing with libvirt led me to the expected issues: eth0 in /e/n/i vs. ens3 on the kernel side. Applying both patches to systemd and rebuilding d-i against its updated udebs gave me proper support for a basic installation (with ens3 in /e/n/i), and also for a desktop-based installation (xfce with network-manager, nothing but loopback in /e/n/i). So that looks good to me! > > I would recommend to only put the debian/udev-udeb.install parts of > > http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?id=7b5eb265bbb2 > > into the t-p-u upload. Or both of the above patches. Either is safe > > against 221-1, the former is less intrusive. Yeah, I felt like getting part of the first commit would do, but it feels a bit better to avoid cutting patches in halves, and to simply merge both of them. As long as you're OK with it, and testing agrees… I've done that and published the debian/221-1+deb9u1 tag on my stretch branch here: https://mraw.org/git/?p=systemd-debian.git git://git.mraw.org/systemd-debian.git > > I need to run for today, but I can prepare an upload tomorrow early > > morning if you want to; if you would like to do that yourself, please > > go ahead with a direct NMU. > > I decided to upload 222-2 to unstable with the aforementioned fixes. > This should give at least the initramfs-tools bits a bit of testing, > even if you decide in the end to only include the udeb bits. Looks great, thanks! > As for doing a t-p-u: sounds fine with me. > I'll be around today/Thursday but then away until Monday. But systemd is > in more then capable hands with Martin. I'm attaching the source debdiff against the version in testing to this mail, so that Niels can (possibly) give me a green light for an upload. Mraw, KiBi.
diff -Nru systemd-221/debian/changelog systemd-221/debian/changelog
--- systemd-221/debian/changelog 2015-06-28 12:05:49.000000000 +0200
+++ systemd-221/debian/changelog 2015-07-16 08:24:46.000000000 +0200
@@ -1,3 +1,15 @@
+systemd (221-1+deb9u1) stretch-proposed-updates; urgency=medium
+
+ [ Cyril Brulebois ]
+ * Fix net.ifnames support in d-i for the Stretch Alpha 1 release by
+ cherry-picking the relevant commits from version 222-2.
+
+ [ Adam Conrad ]
+ * debian/udev-udeb.install: Install new bits for net.ifnames (LP: #1473542)
+ * debian/extra/initramfs-tools/hooks/udev: Do the same for initramfs-tools.
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 16 Jul 2015 08:13:09 +0200
+
systemd (221-1) unstable; urgency=medium
* New upstream release 221:
diff -Nru systemd-221/debian/extra/initramfs-tools/hooks/udev systemd-221/debian/extra/initramfs-tools/hooks/udev
--- systemd-221/debian/extra/initramfs-tools/hooks/udev 2015-06-28 12:05:49.000000000 +0200
+++ systemd-221/debian/extra/initramfs-tools/hooks/udev 2015-07-16 08:24:46.000000000 +0200
@@ -32,8 +32,18 @@
mkdir -p $DESTDIR/etc/udev
cp -p /etc/udev/udev.conf $DESTDIR/etc/udev/
+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
+
mkdir -p $DESTDIR/lib/udev/rules.d/
for rules in 50-firmware.rules 50-udev-default.rules 60-persistent-storage.rules \
+ 70-persistent-net.rules 75-net-description.rules 80-net-setup-link.rules \
61-persistent-storage-android.rules 80-drivers.rules; do
if [ -e /etc/udev/rules.d/$rules ]; then
cp -p /etc/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
diff -Nru systemd-221/debian/udev-udeb.install systemd-221/debian/udev-udeb.install
--- systemd-221/debian/udev-udeb.install 2015-06-28 12:05:49.000000000 +0200
+++ systemd-221/debian/udev-udeb.install 2015-07-16 08:24:46.000000000 +0200
@@ -1,3 +1,4 @@
+lib/systemd/network/99-default.link
lib/systemd/systemd-udevd
bin/udevadm
lib/udev/ata_id
@@ -8,8 +9,11 @@
lib/udev/rules.d/60-persistent-input.rules
lib/udev/rules.d/60-persistent-storage.rules
lib/udev/rules.d/64-btrfs.rules
+lib/udev/rules.d/75-net-description.rules
lib/udev/rules.d/75-probe_mtd.rules
lib/udev/rules.d/80-drivers.rules
+lib/udev/rules.d/80-net-setup-link.rules
+../../extra/01-mac-for-usb.link lib/systemd/network/
../../extra/rules/50-firmware.rules lib/udev/rules.d/
../../extra/rules/73-idrac.rules lib/udev/rules.d/
../../extra/udev-helpers/*.functions lib/udev/
signature.asc
Description: Digital signature
