From 05c83c88227ebcdac4bb15f4dd7ed2a5af59c170 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 27 Feb 2015 01:38:14 +0100 Subject: [PATCH] MT#7335 Use our own Debian/jessie mirror Nowadays we have our own Debian/jessie mirror, so no need to use the external service any longer. Change-Id: I7417680eab43efccb08d98d5b50dafa553296d3e --- deployment.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/deployment.sh b/deployment.sh index db1e8bf..12b4830 100755 --- a/deployment.sh +++ b/deployment.sh @@ -1111,18 +1111,12 @@ cp /etc/apt/trusted.gpg.d/sipwise.gpg "\${MNTPOINT}"/etc/apt/trusted.gpg.d/ EOF chmod 775 /etc/debootstrap/pre-scripts/install-sipwise-key.sh -# drop this once we mirror Debian/jessie -if [ "$DEBIAN_RELEASE" = "jessie" ] ; then - MIRROR='http://debian.inode.at/debian/' - KEYRING='/usr/share/keyrings/debian-archive-keyring.gpg' -else - # NOTE: we use the debian.sipwise.com CNAME by intention here - # to avoid conflicts with apt-pinning, preferring deb.sipwise.com - # over official Debian - MIRROR="http://${DEBIAN_REPO_HOST}/debian/" - SEC_MIRROR="http://${DEBIAN_REPO_HOST}/debian-security/" - KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg' -fi +# NOTE: we use the debian.sipwise.com CNAME by intention here +# to avoid conflicts with apt-pinning, preferring deb.sipwise.com +# over official Debian +MIRROR="http://${DEBIAN_REPO_HOST}/debian/" +SEC_MIRROR="http://${DEBIAN_REPO_HOST}/debian-security/" +KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg' set_deploy_status "debootstrap"