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

added suport for linuxmint with debian base again

Browse source
This commit is contained in:
Carsten Ehbrecht 2014-10-28 17:28:45 +01:00
parent 91e0542daa
commit 2e098666d1
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap-salt.sh
View file

@ -982,11 +982,12 @@ __debian_derivatives_translation() {
# If the file does not exist, return
[ ! -f /etc/os-release ] && return
DEBIAN_DERIVATIVES="(kali)"
DEBIAN_DERIVATIVES="(kali|linuxmint)"
# Mappings
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/.*=//')
# Translate Debian derivatives to their base Debian version
@ -998,6 +999,10 @@ __debian_derivatives_translation() {
_major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
_debian_derivative="kali"
;;
linuxmint)
_major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
_debian_derivative="linuxmint"
;;
esac
_debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base")
@ -3576,7 +3581,7 @@ __configure_freebsd_pkg_details() {
copyfile $conf_file /etc/pkg/FreeBSD.conf
SALT_PKG_FLAGS="-r FreeBSD"
## ensure future ports builds use pkgng
echo "WITH_PKGNG= yes" >> /etc/make.conf
echo "WITH_PKGNG= yes" >> /etc/make.conf
}
install_freebsd_9_stable_deps() {