diff --git a/ChangeLog b/ChangeLog index 95a9e7697..e9c47bb1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 2015.02.28: + * Fix Debian backports repository. + Version 2015.02.27: * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ef3e53827..10bf5df92 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2015.02.27" +__ScriptVersion="2015.02.28" __ScriptName="bootstrap-salt.sh" #====================================================================================================================== @@ -2039,13 +2039,9 @@ _eof fi # Debian Backports - if [ "$(grep -R 'backports.debian.org' /etc/apt)" = "" ]; then - echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \ + if [ "$(grep -R 'squeeze-backports' /etc/apt | grep -v "^#")" = "" ]; then + echo "deb http://http.debian.net/debian-backports squeeze-backports main" >> \ /etc/apt/sources.list.d/backports.list - - # Add the backports key - gpg --keyserver pgpkeys.mit.edu --recv-key 8B48AD6246925553 - gpg -a --export 8B48AD6246925553 | apt-key add - fi # Saltstack's Stable Debian repository @@ -2098,6 +2094,12 @@ install_debian_7_deps() { # Install Keys __apt_get_install_noinput debian-archive-keyring && apt-get update + # Debian Backports + if [ "$(grep -R 'wheezy-backports' /etc/apt | grep -v "^#")" = "" ]; then + echo "deb http://http.debian.net/debian wheezy-backports main" >> \ + /etc/apt/sources.list.d/backports.list + fi + # Saltstack's Stable Debian repository if [ "$(grep -R 'wheezy-saltstack' /etc/apt)" = "" ]; then echo "deb http://debian.saltstack.com/debian wheezy-saltstack main" >> \