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 support to Elementary OS 0.2

Browse source
This commit is contained in:
Juan A. Moyano 2014-04-15 12:44:28 -03:00
parent 267fb30898
commit e05c8c9784
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -369,7 +369,7 @@ Supported Operating Systems
- SmartOS - SmartOS
- SuSE 11 SP1/11 SP2 - SuSE 11 SP1/11 SP2
- Ubuntu 10.x/11.x/12.x/13.04/13.10 - Ubuntu 10.x/11.x/12.x/13.04/13.10
- Elementary OS 0.2

20
bootstrap-salt.sh
View file

@ -879,7 +879,7 @@ __gather_system_info() {
# functions by pretending to be Ubuntu (i.e. change global vars) # functions by pretending to be Ubuntu (i.e. change global vars)
#---------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------
__ubuntu_derivatives_translation() { __ubuntu_derivatives_translation() {
UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro)" UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os)"
# Mappings # Mappings
trisquel_6_ubuntu_base="12.04" trisquel_6_ubuntu_base="12.04"
linuxmint_13_ubuntu_base="12.04" linuxmint_13_ubuntu_base="12.04"
@ -889,15 +889,25 @@ __ubuntu_derivatives_translation() {
# https://bugs.launchpad.net/linuxmint/+bug/1198751 # https://bugs.launchpad.net/linuxmint/+bug/1198751
linuxmint_16_ubuntu_base="13.10" linuxmint_16_ubuntu_base="13.10"
linaro_12_ubuntu_base="12.04" linaro_12_ubuntu_base="12.04"
elementary_os_02_ubuntu_base="12.04"
# Translate Ubuntu derivatives to their base Ubuntu version # Translate Ubuntu derivatives to their base Ubuntu version
match=$(echo $DISTRO_NAME_L | egrep ${UBUNTU_DERIVATIVES}) match=$(echo $DISTRO_NAME_L | egrep ${UBUNTU_DERIVATIVES})
if [ "x${match}" != "x" ]; then if [ "x${match}" != "x" ]; then
_major="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')" case $match in
_ubuntu_version="$(eval echo \$${1}_${_major}_ubuntu_base)" "elementary_os")
if [ "x$_ubuntu_version" != "x" ]; then _major="$(echo $DISTRO_VERSION | sed 's/\.//g')"
;;
*)
_major="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')"
;;
esac
_ubuntu_version="$(eval echo \$${1}_${_major}_ubuntu_base)"
if [ "x$_ubuntu_version" != "x" ]; then
echodebug "Detected Ubuntu $_ubuntu_version derivative" echodebug "Detected Ubuntu $_ubuntu_version derivative"
DISTRO_NAME_L="ubuntu" DISTRO_NAME_L="ubuntu"
DISTRO_VERSION="$_ubuntu_version" DISTRO_VERSION="$_ubuntu_version"