saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #230 from karlgrz/develop

Browse source 
- add patch from issue #229 from s0undt3ch
This commit is contained in:
Pedro Algarvio 2013-09-24 13:59:10 -07:00
commit a30f49c740
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -1115,10 +1115,20 @@ install_ubuntu_deps() {
else
__apt_get_noinput python-software-properties || return 1
fi
if [ "x$(grep -R universe /etc/apt/sources.list /etc/apt/sources.list.d/ | grep -v '#')" != "x" ]; then
__IS_UNIVERSE_ENABLED=$BS_TRUE
else
__IS_UNIVERSE_ENABLED=$BS_FALSE
fi
if [ $DISTRO_MAJOR_VERSION -lt 11 ] && [ $DISTRO_MINOR_VERSION -lt 10 ]; then
add-apt-repository ppa:saltstack/salt || return 1
add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
else
add-apt-repository -y ppa:saltstack/salt || return 1
add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
fi
apt-get update