From 166b5eb4b319b860e3c978c67feb359bcda1fe0c Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Tue, 11 Apr 2017 22:27:08 -0500 Subject: [PATCH 1/2] ubuntu-cpc/060-ipv6.chroot: remove release comparison (LP: #1681548) --- debian/changelog | 4 ++++ live-build/ubuntu-cpc/hooks/060-ipv6.chroot | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09c12669..eef10ec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ livecd-rootfs (2.441) UNRELEASED; urgency=medium [ Balint Reczey ] * Add a basic but configurable autopkgtest. + [ Robert Jennings ] + * live-build/ubuntu-cpc/hooks/060-ipv6.chroot: remove faulty release + comparison prior to aa-series (LP: #1681548) + -- Steve Langasek Mon, 10 Apr 2017 16:35:03 -0700 livecd-rootfs (2.440) zesty; urgency=medium diff --git a/live-build/ubuntu-cpc/hooks/060-ipv6.chroot b/live-build/ubuntu-cpc/hooks/060-ipv6.chroot index 3d4a0be2..532b8473 100755 --- a/live-build/ubuntu-cpc/hooks/060-ipv6.chroot +++ b/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 From 01b476c0ebd07af33d7ea9416526512d21878afe Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Tue, 11 Apr 2017 22:27:58 -0500 Subject: [PATCH 2/2] live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure Failure should be quick to eliminate excessive buildd time and make identification of failure easier (no more buried errors). --- debian/changelog | 1 + live-build/ubuntu-cpc/hooks/999-extras.binary | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eef10ec9..b2a40fe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ livecd-rootfs (2.441) 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 Mon, 10 Apr 2017 16:35:03 -0700 diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary index c36b1e7f..2dd1dbd3 100755 --- a/live-build/ubuntu-cpc/hooks/999-extras.binary +++ b/live-build/ubuntu-cpc/hooks/999-extras.binary @@ -12,4 +12,4 @@ fi . config/functions # Cleaner execution -/bin/run-parts --regex ".*\.binary" "${extra_d}" +/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"