Merge lp:~oddbloke/livecd-rootfs/interface-naming into lp:livecd-rootfs

Proposed by Dan Watkins on 2016-04-14
Status: Merged
Merged at revision: 1365
Proposed branch: lp:~oddbloke/livecd-rootfs/interface-naming
Merge into: lp:livecd-rootfs
Diff against target: 61 lines (+9/-8)
5 files modified
debian/changelog (+7/-0)
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary (+1/-1)
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+1/-1)
live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces (+0/-3)
live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg (+0/-3)
To merge this branch: bzr merge lp:~oddbloke/livecd-rootfs/interface-naming
Reviewer Review Type Date Requested Status
Robert C Jennings (community) Approve on 2016-04-14
Ubuntu Core Development Team 2016-04-14 Pending
Review via email: mp+291928@code.launchpad.net

Commit message

* Re-enable systemd predictable network interface naming on cloud-images
* Stop creating default configuration for eth0 (LP: #1563487)

To post a comment you must log in.
Robert C Jennings (rcj) wrote :

Dan, this looks good.

review: Approve
Scott Moser (smoser) wrote :

please set a unified commit message, and mark that this fixes
 https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1563487

1367. By Dan Watkins on 2016-04-14

Update changelog with:

* Re-enable systemd predictable network interface naming on cloud-images
* Stop creating default configuration for eth0 (LP: #1563487)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-14 04:59:33 +0000
3+++ debian/changelog 2016-04-14 18:41:29 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.401) UNRELEASED; urgency=medium
6+
7+ * Re-enable systemd predictable network interface naming on cloud-images
8+ * Stop creating default configuration for eth0 (LP: #1563487)
9+
10+ -- Daniel Watkins <daniel.watkins@canonical.com> Thu, 14 Apr 2016 11:08:11 -0700
11+
12 livecd-rootfs (2.400) xenial; urgency=medium
13
14 * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd.
15
16=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
17--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2016-04-07 13:34:12 +0000
18+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2016-04-14 18:41:29 +0000
19@@ -41,7 +41,7 @@
20 GRUB_TIMEOUT=0
21
22 # Set the default commandline
23-GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0"
24+GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
25 EOF
26 prep_partition="/dev/mapper${loop_device///dev/}p2"
27 chroot mountpoint grub-install "${prep_partition}" \
28
29=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
30--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-04-07 13:42:08 +0000
31+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-04-14 18:41:29 +0000
32@@ -263,7 +263,7 @@
33 GRUB_TIMEOUT=0
34
35 # Set the default commandline
36-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 net.ifnames=0"
37+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
38
39 # Set the grub console type
40 GRUB_TERMINAL=console
41
42=== modified file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces'
43--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 2015-04-08 08:34:15 +0000
44+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 2016-04-14 18:41:29 +0000
45@@ -8,8 +8,5 @@
46 # Source interfaces
47 # Please check /etc/network/interfaces.d before changing this file
48 # as interfaces may have been defined in /etc/network/interfaces.d
49-# NOTE: the primary ethernet device is defined in
50-# /etc/network/interfaces.d/eth0
51 # See LP: #1262951
52 source /etc/network/interfaces.d/*.cfg
53-
54
55=== removed file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg'
56--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg 2015-04-08 08:34:15 +0000
57+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg 1970-01-01 00:00:00 +0000
58@@ -1,3 +0,0 @@
59-# The primary network interface
60-auto eth0
61-iface eth0 inet dhcp

Subscribers

People subscribed via source and target branches