From 8ea490e6a2a9d86e680d48d4e271613203710baf Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 31 Jan 2018 20:54:54 -0700 Subject: [PATCH] Import patches-unapplied version 2.497 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 9df196f7f13b1607f298278d2ea966baf86b272c New changelog entries: * live-build/auto/config: Clean out unused hostname matches and fix indenting. * live-build/auto/config: Reinstate hostname filtering for "*.buildd", which is the correct match for non-lxd builders, and add "lp-*" for the lxd ones. * live-build/auto/config: Fix incorrect quoting causing a skipped if statement in non-live ubuntu-server builds since sometime in mid-October of last year. --- debian/changelog | 10 ++++++++++ live-build/auto/config | 21 +++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40044189..fa7dd6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.497) bionic; urgency=medium + + * live-build/auto/config: Clean out unused hostname matches and fix indenting. + * live-build/auto/config: Reinstate hostname filtering for "*.buildd", which + is the correct match for non-lxd builders, and add "lp-*" for the lxd ones. + * live-build/auto/config: Fix incorrect quoting causing a skipped if statement + in non-live ubuntu-server builds since sometime in mid-October of last year. + + -- Adam Conrad Wed, 31 Jan 2018 20:54:54 -0700 + livecd-rootfs (2.496) bionic; urgency=medium * Update hostname matches for launchpad buildds to match current practice, diff --git a/live-build/auto/config b/live-build/auto/config index 08c06ac0..3cc294e1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -8,13 +8,6 @@ echo "Building on $(hostname --fqdn)" SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in - bld-*.mmjgroup.com) ;; - *.mmjgroup.com) - case $ARCH in - i386|amd64) MIRROR=http://archive.mmjgroup.com/ubuntu/ ;; - *) MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;; - esac - ;; *.0c3.net) case $ARCH in i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;; @@ -24,17 +17,17 @@ if [ -z "$MIRROR" ]; then *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ + *.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *) case $ARCH in - i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; - *) MIRROR=http://ports.ubuntu.com/ubuntu-ports ;; - esac - ;; + *) case $ARCH in + i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) MIRROR=http://ports.ubuntu.com/ubuntu-ports/ ;; + esac + ;; esac fi @@ -878,7 +871,7 @@ EOF ;; esac -if [ $PROJECT = ubuntu-server ] && [ ${SUBPROJECT:-} != live ]; then +if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then cat > config/hooks/100-remove-fstab.chroot <