Merge lp:~rcj/livecd-rootfs/trunk/

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.442) UNRELEASED; urgency=medium
+
+  [ Robert Jennings ]
+  * live-build/ubuntu-cpc/hooks/060-ipv6.chroot: remove faulty release
+    comparison prior to aa-series (LP: #1681548)
+  * live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Apr 2017 10:38:04 -0700
+
 livecd-rootfs (2.441) zesty; urgency=medium
 
   [ Balint Reczey ]

live-build/ubuntu-cpc/hooks/060-ipv6.chroot

@@ -1,15 +1,8 @@
 #!/bin/bash
 #
-# Disable IPv6 privacy extensions on Utopic and later
+# Disable IPv6 privacy extensions
 #
 
-codename=$(sh -c 'lsb_release --short --codename')
-dist_ge() { [[ "$1" > "$2" || "$1" == "$2" ]]; }
-
-if ! dist_ge "${codename}" "trusty"; then
-    exit 0
-fi
-
 cat << EOF > /etc/sysctl.d/99-cloudimg-ipv6.conf
 # Written by the Cloud Image build process
 # See https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1068756

live-build/ubuntu-cpc/hooks/999-extras.binary

@@ -13,4 +13,4 @@ export CLOUD_IMG_STR="$IMAGE_STR"
 export FS_LABEL="cloudimg-rootfs"
 
 # Cleaner execution
-/bin/run-parts --regex ".*\.binary" "${extra_d}"
+/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"