From 58de2947145c1bc3975c90e40428c5b6875a803d Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 31 Jan 2018 09:38:07 +0000 Subject: [PATCH] Import patches-unapplied version 2.495 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 694a6b88d15ba047c8a1a18fca82aee25c975afa New changelog entries: * Set ports/archive as appropriate for default mirror - should fix autopkgtests. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d91a4c82..68ec1d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.495) bionic; urgency=medium + + * Set ports/archive as appropriate for default mirror - should fix + autopkgtests. + + -- Iain Lane Wed, 31 Jan 2018 09:38:07 +0000 + livecd-rootfs (2.494) bionic; urgency=medium * Run subiquity on any serial consoles that the user told systemd diff --git a/live-build/auto/config b/live-build/auto/config index b8732884..5a004c01 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -30,7 +30,11 @@ if [ -z "$MIRROR" ]; then *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) case $ARCH in + i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) MIRROR=http://ports.ubuntu.com/ubuntu-ports ;; + esac + ;; esac fi