Merge lp:~darkmuggle-deactivatedaccount/livecd-rootfs/lp1510345 into lp:livecd-rootfs

[Ben Howard]

Cloud Images: Revert NIC device naming to use old conventions. This is needed due to Bug #1510345, which is causing some instance types on AWS to fail to boot.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-29 12:02:16 +0000
+++ debian/changelog	2015-10-29 14:13:54 +0000
@@ -1,10 +1,14 @@
-livecd-rootfs (2.350) UNRELEASED; urgency=medium
+livecd-rootfs (2.350) xenial; urgency=medium
 
+  [ Oliver Grawert ]
   * bump UID for tss user in snappy, else it matches dnsmasq and bad things
     happen
   * fix handling of writable files in /etc/default for snappy 
 
- -- Oliver Grawert <[e-mail]>  Thu, 22 Oct 2015 11:34:34 +0200
+  [ Ben Howard ]
+  * Cloud Images: disable new NIC naming convention (LP: #1510345).
+
+ -- Ben Howard <[e-mail]>  Thu, 29 Oct 2015 07:50:56 -0600
 
 livecd-rootfs (2.349) wily; urgency=medium
 

=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2015-04-08 08:34:15 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2015-10-29 14:13:54 +0000
@@ -229,7 +229,7 @@
 GRUB_TIMEOUT=0
 
 # Set the default commandline
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 net.ifnames=0"
 
 # Set the grub console type
 GRUB_TERMINAL=console