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

moved fix to right place

Browse source
This commit is contained in:
Thomas Werkmeister 2013-04-16 15:11:34 +02:00
parent 7bf8434eef
commit 06687e14d6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -477,6 +477,10 @@ __gather_linux_system_info() {
# Let's convert CamelCase to Camel Case
DISTRO_NAME=$(__camelcase_split "$DISTRO_NAME")
fi
#lsb_release -si returns "openSUSE project" on openSUSE 12.3
if [ "${DISTRO_NAME}" = "openSUSE project" ]; then
DISTRO_NAME="opensuse"
fi
rv=$(lsb_release -sr)
[ "${rv}x" != "x" ] && DISTRO_VERSION=$(__parse_version_string "$rv")
elif [ -f /etc/lsb-release ]; then
@ -723,12 +727,6 @@ if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ $ITYPE = "daily" ]) && \
echoerror "${DISTRO_NAME} does not have daily packages support"
exit 1
fi
#lsb_release -si returns "openSUSE project" on openSUSE 12.3
if [ "${DISTRO_NAME_L}" = "opensuse_project" ]; then
DISTRO_NAME_L="opensuse"
fi
#--- FUNCTION ----------------------------------------------------------------
# NAME: __function_defined