Fixing udev-udeb vs. net.ifnames for Stretch Alpha 1

[Martin Pitt]

Hey Cyril,

thanks for preparing the update! FTR, the debdiff below looks good to
me, +1.

Martin

Cyril Brulebois [2015-07-16  9:23 +0200]:
> 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 <kibi at 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/



-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20150716/46f68efe/attachment-0002.sig>