Import patches-unapplied version 2.350 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 5edb230a21

New changelog entries:
  [ 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 
  [ Ben Howard ]
  * Cloud Images: disable new NIC naming convention (LP: #1510345).

debian/changelog

@@ -1,3 +1,15 @@
+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 
+
+  [ Ben Howard ]
+  * Cloud Images: disable new NIC naming convention (LP: #1510345).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 29 Oct 2015 14:25:28 +0000
+
 livecd-rootfs (2.349) wily; urgency=medium
 
   * do not hardcode installation of grub-pc for amd64 in snappy images,

live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early

@@ -45,7 +45,7 @@ systemd-bus-proxy:x:106:111:systemd Bus Proxy,,,:/run/systemd:/bin/false
 docker:x:107:113::/nonexistent:/bin/false
 syslog:x:108:114::/home/syslog:/bin/false
 dnsmasq:x:109:65534:dnsmasq,,,:/var/lib/misc:/bin/false
-tss:x:109:116::/var/lib/tpm:/bin/false
+tss:x:110:116::/var/lib/tpm:/bin/false
 EOF
 else
     echo "/etc/passwd post-debootstrap hash doesn't match record" >&2

live-build/ubuntu-core/hooks/08-etc-writable.chroot

@@ -1,11 +1,11 @@
 #!/bin/sh
 set -e
 
-mkdir -p /etc/writable
+mkdir -p /etc/writable/default
 
 # cloud-init needs to be able to modify hostname and has the ability to
 # set the other two.
-for f in timezone localtime hostname; do
+for f in timezone localtime hostname watchdog.conf; do
     if [ -e /etc/$f ]; then
         echo "I: Moving /etc/$f to /etc/writable/"
         mv /etc/$f /etc/writable/$f
@@ -13,3 +13,14 @@ for f in timezone localtime hostname; do
     echo "I: Linking /etc/$f to /etc/writable/"
     ln -s writable/$f /etc/$f
 done
+
+# do the same for /etc/default files
+for f in watchdog; do
+    if [ -e /etc/default/$f ]; then
+        echo "I: Moving /etc/default/$f to /etc/writable/default"
+        mv /etc/default/$f /etc/writable/default/$f
+    fi
+    echo "I: Linking /etc/default/$f to /etc/writable/default"
+    ln -s /etc/writable/default/$f /etc/default/$f
+done
+

live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot

@@ -229,7 +229,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
 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