Import patches-unapplied version 2.409 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 689e55f031

New changelog entries:
  [ Michael Vogt ]
  * add meta/kernel.yaml to the kernel snaps
  [ Łukasz 'sil2100' Zemczak ]
  * Add the new dhcpd user introduced by latest archive changes.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.409) yakkety; urgency=medium
+
+  [ Michael Vogt ]
+  * add meta/kernel.yaml to the kernel snaps
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add the new dhcpd user introduced by latest archive changes.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 04 May 2016 12:49:23 +0200
+
 livecd-rootfs (2.408) xenial; urgency=medium
 
   * drop linux-firmware-raspi2, it does not actually contain driver

live-build/auto/build

@@ -568,6 +568,10 @@ EOF
 
         VERSION=$kvers+$(date +20%y%m%d.%H-%M)
 
+        cat > meta/kernel.yaml <<EOF
+version: $kvers
+EOF
+        
         cat > meta/snap.yaml <<EOF
 name: $metaname
 version: $VERSION

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

@@ -53,6 +53,7 @@ systemd-network:x:112:117:systemd Network Management,,,:/run/systemd/netif:/bin/
 systemd-resolve:x:113:118:systemd Resolver,,,:/run/systemd/resolve:/bin/false
 systemd-bus-proxy:x:114:119:systemd Bus Proxy,,,:/run/systemd:/bin/false
 nm-openvpn:x:115:120:NetworkManager OpenVPN,,,:/var/lib/openvpn/chroot:/bin/false
+dhcpd:x:116:122::/var/run:/bin/false
 EOF
 else
     echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
@@ -101,6 +102,7 @@ systemd-network:*:16372:0:99999:7:::
 systemd-resolve:*:16372:0:99999:7:::
 systemd-bus-proxy:*:16372:0:99999:7:::
 nm-openvpn:*:16909:0:99999:7:::
+dhcpd:*:16925:0:99999:7:::
 EOF
 else
     echo "/etc/shadow post-debootstrap hash doesn't match record" >&2
@@ -186,6 +188,7 @@ systemd-resolve:x:118:
 systemd-bus-proxy:x:119:
 input:x:121:
 nm-openvpn:x:120:
+dhcpd:x:122:
 EOF
 else
     echo "/etc/group post-debootstrap hash doesn't match record" >&2
@@ -271,6 +274,7 @@ systemd-resolve:!::
 systemd-bus-proxy:!::
 input:!::
 nm-openvpn:!::
+dhcpd:!::
 EOF
 else
     echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2