sync up-to-date hooks (how did that happen?)

live-build/hooks/18-set-os-release.chroot

@@ -5,7 +5,7 @@ NAME="Ubuntu Core"
 VERSION="16"
 ID=ubuntu-core
 PRETTY_NAME="Ubuntu Core 16"
-VERSION_ID="16""
+VERSION_ID="16"
 HOME_URL="http://www.snapcraft.io/"
 BUG_REPORT_URL="http://bugs.launchpad.net/snappy/"
 EOF

live-build/hooks/19-remove-cloud-init-locale-test.chroot

@@ -3,5 +3,11 @@
 set -e
 
 # bug #1637611
-echo "removing /etc/profile.d/Z99-cloud-locale-test.sh"
-[ -e /etc/profile.d/Z99-cloud-locale-test.sh ] && rm /etc/profile.d/Z99-cloud-locale-test.sh
+echo "turning /etc/profile.d/Z99-cloud-locale-test.sh into a no-op"
+if [ -e /etc/profile.d/Z99-cloud-locale-test.sh ]; then
+	cat >/etc/profile.d/Z99-cloud-locale-test.sh<<EOF
+#!/bin/sh
+
+return 0
+EOF
+fi

live-build/hooks/22-setup-path.chroot

@@ -0,0 +1,12 @@
+#!/bin/sh -x
+
+set -e
+
+# Fix the PATH to also contain /snap/bin for non-interactive
+# ssh shells LP: #1659719
+
+echo "putting a PATH in place that contains /snap/bin"
+echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin"' >/etc/environment
+
+echo "removing profile.d PATH snippet"
+rm -f /etc/profile.d/apps-bin-path.sh

live-build/hooks/300-create-classic-diff.binary

@@ -12,7 +12,7 @@ PREFIX=binary/boot/filesystem.dir
 (cd $PREFIX
  mkdir -p var/lib/classic
  apt-get clean
- apt-get install --reinstall -d apt locales
+ apt-get install --reinstall -d apt locales base-files libapt-inst2.0 libapt-pkg5.0
  cp /var/cache/apt/archives/*.deb var/cache/apt/archives/
 
  tar czvf var/lib/classic/classic-diff.tgz \
@@ -30,6 +30,7 @@ rm -f /usr/local/bin/* /etc/apt/sources.list.d/*
 tar xf /var/lib/classic/classic-diff.tgz -C /
 
 dpkg -i /var/cache/apt/archives/*.deb
+dpkg -i --force-confask --force-confnew /var/cache/apt/archives/base-files*.deb
 
 apt-get clean
 EOF

live-build/hooks/600-no-debian.binary

@@ -16,7 +16,7 @@ PREFIX=binary/boot/filesystem.dir
 
 # dpkg-deb and dpkg purposefully left behind
 (cd $PREFIX
-    chroot . dpkg --purge apt
+    chroot . dpkg --purge --force-depends apt libapt-inst2.0 libapt-pkg5.0
     rm -r \
         var/lib/dpkg \
         var/log/apt
@@ -27,4 +27,9 @@ PREFIX=binary/boot/filesystem.dir
         usr/bin/dpkg-trigger \
         usr/bin/dpkg-statoverride \
         usr/bin/dpkg-maintscript-helper
+    # remove generated locales for packages we do not use
+    rm -f usr/share/locale/*/LC_MESSAGES/dpkg*
+    rm -f usr/share/locale/*/LC_MESSAGES/libapt*
+    # also remove lsb_release (LP: #1619420)
+    rm -f usr/bin/lsb_release
 )

live-build/hooks/80-remove-blacklist-watchdog-file.chroot

@@ -0,0 +1,7 @@
+#! /bin/sh -ex
+
+# we want the watchdog modules to load for now so that
+# a systemd watchdog setup can use the modules
+# (LP: #1647992)
+
+rm -f /etc/modprobe.d/blacklist-watchdog.conf

live-build/hooks/90-configure-hook.chroot

@@ -0,0 +1,5 @@
+#!/bin/sh -ex
+
+# add all requirements for bits used by the hooks/configure script
+
+mkdir -p /etc/systemd/logind.conf.d