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

[Dan Watkins]

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

[Robert C Jennings (rcj)]

Dan, this looks good.

review: Approve

[Scott Moser (smoser)]

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

[lp:~oddbloke/livecd-rootfs/interface-naming]

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)

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-14 04:59:33 +0000
+++ debian/changelog	2016-04-14 18:41:29 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.401) UNRELEASED; urgency=medium
+
+  * Re-enable systemd predictable network interface naming on cloud-images
+  * Stop creating default configuration for eth0 (LP: #1563487)
+
+ -- Daniel Watkins <[e-mail]>  Thu, 14 Apr 2016 11:08:11 -0700
+
 livecd-rootfs (2.400) xenial; urgency=medium
 
   * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd.

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2016-04-07 13:34:12 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2016-04-14 18:41:29 +0000
@@ -41,7 +41,7 @@
 GRUB_TIMEOUT=0
 
 # Set the default commandline
-GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0"
+GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
 EOF
     prep_partition="/dev/mapper${loop_device///dev/}p2"
     chroot mountpoint grub-install "${prep_partition}" \

=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2016-04-07 13:42:08 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2016-04-14 18:41:29 +0000
@@ -263,7 +263,7 @@
 GRUB_TIMEOUT=0
 
 # Set the default commandline
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 net.ifnames=0"
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
 
 # Set the grub console type
 GRUB_TERMINAL=console

=== modified file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces'
--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces	2015-04-08 08:34:15 +0000
+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces	2016-04-14 18:41:29 +0000
@@ -8,8 +8,5 @@
 # Source interfaces
 # Please check /etc/network/interfaces.d before changing this file
 # as interfaces may have been defined in /etc/network/interfaces.d
-# NOTE: the primary ethernet device is defined in
-# /etc/network/interfaces.d/eth0
 # See LP: #1262951
 source /etc/network/interfaces.d/*.cfg
-

=== removed file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg'
--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg	2015-04-08 08:34:15 +0000
+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# The primary network interface
-auto eth0
-iface eth0 inet dhcp