From 15e23d2de5c7b4c860d6153c21e816fb1066de21 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jun 2011 11:50:09 +0100 Subject: [PATCH] make it easier to use a custom mirror --- live-build/auto/config | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 97d360df..08ab3c19 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1,21 +1,21 @@ #! /bin/sh set -e -MIRROR= -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) MIRROR=http://ftp.iinet.net.au/linux/ubuntu/ ;; - *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; - *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; - *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ ;; - *) ;; -esac +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) MIRROR=http://ftp.iinet.net.au/linux/ubuntu/ ;; + *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; + *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ ;; + *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ ;; + esac +fi mkdir -p config/chroot_local-tasklists config/chroot_local-packagelists rm -f config/chroot_local-tasklists/livecd-rootfs.list config/chroot_local-packagelists/livecd-rootfs.list