Ubuntu Pastebin

Paste from adconrad at Fri, 10 Jul 2015 21:36:51 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
diff -Nru systemd-222/debian/changelog systemd-222/debian/changelog
--- systemd-222/debian/changelog	2015-07-08 22:54:47.000000000 -0600
+++ systemd-222/debian/changelog	2015-07-10 15:35:47.000000000 -0600
@@ -1,3 +1,10 @@
+systemd (222-1ubuntu2) wily; urgency=medium
+
+  * debian/udev-udeb.install: Install new bits for net.ifnames (LP: #1473542)
+  * debian/extra/initramfs-tools/hooks/udev: Do the same for initramfs-tools.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 10 Jul 2015 15:24:13 -0600
+
 systemd (222-1ubuntu1) wily; urgency=medium
 
   * Merge with Debian unstable. Remaining Ubuntu changes:
diff -Nru systemd-222/debian/extra/initramfs-tools/hooks/udev systemd-222/debian/extra/initramfs-tools/hooks/udev
--- systemd-222/debian/extra/initramfs-tools/hooks/udev	2015-07-08 22:54:47.000000000 -0600
+++ systemd-222/debian/extra/initramfs-tools/hooks/udev	2015-07-10 15:34:47.000000000 -0600
@@ -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 \
+	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-222/debian/udev-udeb.install systemd-222/debian/udev-udeb.install
--- systemd-222/debian/udev-udeb.install	2015-07-08 22:54:47.000000000 -0600
+++ systemd-222/debian/udev-udeb.install	2015-07-10 15:24:11.000000000 -0600
@@ -1,3 +1,5 @@
+lib/systemd/network/01-mac-for-usb.link
+lib/systemd/network/99-default.link
 lib/systemd/systemd-udevd
 bin/udevadm
 lib/udev/ata_id
@@ -8,8 +10,10 @@
 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/rules/50-firmware.rules lib/udev/rules.d/
 ../../extra/rules/73-idrac.rules lib/udev/rules.d/
 ../../extra/udev-helpers/*.functions lib/udev/
Download as text