From 9df196f7f13b1607f298278d2ea966baf86b272c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 31 Jan 2018 16:41:23 -0800 Subject: [PATCH] Import patches-unapplied version 2.496 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 58de2947145c1bc3975c90e40428c5b6875a803d New changelog entries: * Update hostname matches for launchpad buildds to match current practice, fixing build failures due to LP being unable to reach people.canonical.com. --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 68ec1d83..40044189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.496) bionic; urgency=medium + + * Update hostname matches for launchpad buildds to match current practice, + fixing build failures due to LP being unable to reach + people.canonical.com. + + -- Steve Langasek Wed, 31 Jan 2018 16:41:23 -0800 + livecd-rootfs (2.495) bionic; urgency=medium * Set ports/archive as appropriate for default mirror - should fix diff --git a/live-build/auto/config b/live-build/auto/config index 5a004c01..08c06ac0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -27,7 +27,7 @@ if [ -z "$MIRROR" ]; then *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ + *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *) case $ARCH in