Import patches-unapplied version 2.343 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 69a5210a53

New changelog entries:
  [ Oliver Grawert ]
  * add empty "extrausers" equivalents for subuid and subgid files, else
    adduser falls over in interactive mode when trying to write to them.
  [ Iain Lane ]
  * live-build/ubuntu-touch/hooks/03-etc-writable.chroot: Set up /etc/whoopsie
    too. (LP: #1437633)

debian/changelog

@@ -1,3 +1,15 @@
+livecd-rootfs (2.343) wily; urgency=medium
+
+  [ Oliver Grawert ]
+  * add empty "extrausers" equivalents for subuid and subgid files, else
+    adduser falls over in interactive mode when trying to write to them.
+
+  [ Iain Lane ]
+  * live-build/ubuntu-touch/hooks/03-etc-writable.chroot: Set up /etc/whoopsie
+    too. (LP: #1437633)
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Thu, 10 Sep 2015 12:22:57 +0100
+
 livecd-rootfs (2.342) wily; urgency=medium
 
   * ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group

live-build/ubuntu-core/hooks/01-setup_user.chroot

@@ -30,6 +30,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # needs to run *after* the user was moved out to /var/lib/extrausers
 echo "I: set user $USER password to $USER"

live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot

@@ -35,6 +35,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # needs to run *after* the user was moved out to /var/lib/extrausers
 echo "I: set user $USER password to $USER"

live-build/ubuntu-touch/hooks/01-setup_user.chroot

@@ -32,6 +32,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # Prevent the system user from being presented in the greeter by bumping MIN_UID
 sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs

live-build/ubuntu-touch/hooks/03-etc-writable.chroot

@@ -5,7 +5,7 @@ set -x
 mkdir -p /etc/writable
 touch /etc/writable/machine-info
 
-for f in timezone localtime machine-info hostname; do
+for f in timezone localtime machine-info hostname whoopsie; do
     if [ -e /etc/$f ]; then
         echo "I: Moving /etc/$f to /etc/writable/"
         mv /etc/$f /etc/writable/$f