sipwise
/
netscript
mirror of https://github.com/sipwise/netscript.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#7335 Disable security mirror when installing jessie

Browse Source 
Noticed in failing Jenkins job
https://jenkins.mgm.sipwise.com/job/daily-build-install-vm/7470/
being downstream of https://jenkins.mgm.sipwise.com/job/build-trunk-systemd-vms:

| W: Failed to fetch http://debian.sipwise.com/debian-security/dists/jessie-security/non-free/binary-amd64/Packages  404  Not Found [IP: 77.244.249.93 80]

Debian/jessie gets security support once it's released as stable,
until then we've to ignore the (unavailable) debian-security mirror.

This fixes behaviour which got broken in git commit 05c83c88.

Change-Id: Icb5d9974b50119254f4ba0fa5b60b18a38dcb21c
changes/90/1290/1
Michael Prokop 11 years ago
parent e51ca3f986
commit f40a15b788
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
deployment.sh
Unescape View File

@ -1128,7 +1128,6 @@ fi
# to avoid conflicts with apt-pinning, preferring deb.sipwise.com # to avoid conflicts with apt-pinning, preferring deb.sipwise.com
# over official Debian # over official Debian
MIRROR="http://${DEBIAN_REPO_HOST}/debian/" MIRROR="http://${DEBIAN_REPO_HOST}/debian/"
SEC_MIRROR="http://${DEBIAN_REPO_HOST}/debian-security/"
KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg' KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg'
set_deploy_status "debootstrap" set_deploy_status "debootstrap"
@ -1140,12 +1139,13 @@ cat > /etc/debootstrap/etc/apt/sources.list << EOF
deb ${MIRROR} ${DEBIAN_RELEASE} main contrib non-free deb ${MIRROR} ${DEBIAN_RELEASE} main contrib non-free
EOF EOF
# drop this once Debian/jessie has security support # drop this once Debian/jessie has security support (AKA released as stable)
if [ -n "$SEC_MIRROR" ] ; then if [ "$DEBIAN_RELEASE" = "jessie" ] ; then
echo "deb ${SEC_MIRROR} ${DEBIAN_RELEASE}-security main contrib non-free" >> /etc/debootstrap/etc/apt/sources.list echo "Warning: not enabling security repository for $DEBIAN_RELEASE"
logit "Warning: not enabling security repository for $DEBIAN_RELEASE"
else else
echo "Warning: security mirror variable SEC_MIRROR is unset, not enabling security repository for $DEBIAN_RELEASE" SEC_MIRROR="http://${DEBIAN_REPO_HOST}/debian-security/"
logit "Warning: security mirror variable SEC_MIRROR is unset, not enabling security repository for $DEBIAN_RELEASE" echo "deb ${SEC_MIRROR} ${DEBIAN_RELEASE}-security main contrib non-free" >> /etc/debootstrap/etc/apt/sources.list
fi fi
echo "deb ${MIRROR} ${DEBIAN_RELEASE}-updates main contrib non-free" >> /etc/debootstrap/etc/apt/sources.list echo "deb ${MIRROR} ${DEBIAN_RELEASE}-updates main contrib non-free" >> /etc/debootstrap/etc/apt/sources.list

Write Preview
Loading…
Cancel
Save