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

1) Fixed wording on the -U option

Browse source 
2) Added a -K option to keep temporary files
3) Some tweaking with Ubuntu repository setup (11.04 logic seems to be off with respect to the -y choice). Made the adding of the universe dependent on it not being already there.

Open question… for older Ubuntu versions the archive location added for the universe seems wrong. The one I know is:

deb http://old-releases.ubuntu.com/ubuntu/ natty main restricted universe multiverse
deb http://old-releases.ubuntu.com/ubuntu/ natty-updates main restricted universe multiverse
deb http://old-releases.ubuntu.com/ubuntu/ natty-security main restricted universe multiverse

However, I did not change the code at this point as that seems like it should be tested independently (maybe my expectations here are off).
This commit is contained in:
sdelmas 2013-09-24 17:10:06 -07:00
parent f424df9463
commit e65e7e8cb5
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bootstrap-salt.sh
View file

@ -154,7 +154,9 @@ usage() {
resort method. NOTE: This works for functions which actually implement
pip based installations.
-F Allow copied files to overwrite existing(config, init.d, etc)
-U If optional, don't fully upgrade the system prior to bootstrapping salt
-U If set, fully upgrade the system prior to bootstrapping salt
-K If set, keep the temporary files in the temporary directories specified
with -c and -k.
EOT
} # ---------- end of function usage ----------
@ -239,7 +241,7 @@ _UPGRADE_SYS=${BS_UPGRADE_SYS:-$BS_FALSE}
# __SIMPLIFY_VERSION is mostly used in Solaris based distributions
__SIMPLIFY_VERSION=$BS_TRUE
while getopts ":hvnDc:k:MSNCPFU" opt
while getopts ":hvnDc:k:MSNCPFUK" opt
do
case "${opt}" in
@ -273,6 +275,7 @@ do
P ) _PIP_ALLOWED=$BS_TRUE ;;
F ) _FORCE_OVERWRITE=$BS_TRUE ;;
U ) _UPGRADE_SYS=$BS_TRUE ;;
K ) _KEEP_TEMP_FILES=$BS_TRUE ;;
\?) echo
echoerror "Option does not exist : $OPTARG"
@ -1122,13 +1125,18 @@ install_ubuntu_deps() {
__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
# for anything up to and including 11.04 do not use the -y option
if [ $DISTRO_MAJOR_VERSION -eq 11 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
# Above Ubuntu 11.04 add a -y flag
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
if [ $__IS_UNIVERSE_ENABLED -eq $BS_FALSE ]; then
add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
fi
else
add-apt-repository ppa:saltstack/salt || return 1
if [ $__IS_UNIVERSE_ENABLED -eq $BS_FALSE ]; then
add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
fi
fi
apt-get update
@ -1148,10 +1156,12 @@ install_ubuntu_daily_deps() {
else
__apt_get_noinput python-software-properties || return 1
fi
if [ $DISTRO_MAJOR_VERSION -lt 11 ] && [ $DISTRO_MINOR_VERSION -lt 10 ]; then
add-apt-repository ppa:saltstack/salt-daily || return 1
else
# for anything up to and including 11.04 do not use the -y option
if [ $DISTRO_MAJOR_VERSION -eq 11 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
# Above Ubuntu 11.04 add a -y flag
add-apt-repository -y ppa:saltstack/salt-daily || return 1
else
add-apt-repository ppa:saltstack/salt-daily || return 1
fi
apt-get update