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

Merge branch 'develop' of github.com:saltstack/salt-bootstrap into stable

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-08 09:17:14 +00:00
commit 05b840f224
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bootstrap-salt.sh
View file

@ -987,11 +987,12 @@ __debian_derivatives_translation() {
# If the file does not exist, return # If the file does not exist, return
[ ! -f /etc/os-release ] && return [ ! -f /etc/os-release ] && return
DEBIAN_DERIVATIVES="(kali)" DEBIAN_DERIVATIVES="(kali|linuxmint)"
# Mappings # Mappings
kali_1_debian_base="7.0" kali_1_debian_base="7.0"
linuxmint_1_debian_base="8.0"
# Detect derivates, Kali *only* for now # Detect derivates, Kali and LinuxMint *only* for now
rv=$(grep ^ID= /etc/os-release | sed -e 's/.*=//') rv=$(grep ^ID= /etc/os-release | sed -e 's/.*=//')
# Translate Debian derivatives to their base Debian version # Translate Debian derivatives to their base Debian version
@ -1003,6 +1004,10 @@ __debian_derivatives_translation() {
_major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g') _major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
_debian_derivative="kali" _debian_derivative="kali"
;; ;;
linuxmint)
_major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
_debian_derivative="linuxmint"
;;
esac esac
_debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base") _debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base")
@ -2921,11 +2926,6 @@ install_red_hat_linux_git_deps() {
return 0 return 0
} }
install_red_hat_enterprise_linux_7_stable_deps() {
echoerror "Stable version is not available on RHEL 7 Beta/RC. Please set installation type to git."
return 1
}
install_red_hat_enterprise_linux_stable_deps() { install_red_hat_enterprise_linux_stable_deps() {
install_red_hat_linux_stable_deps || return 1 install_red_hat_linux_stable_deps || return 1
return 0 return 0