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' into stable for v2014.09.25

Browse source
This commit is contained in:
Pedro Algarvio 2014-09-25 16:38:11 +01:00
commit bf9364a9ba
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,6 +1,5 @@
Version 2014.09.24: Version 2014.09.25:
* Fixed salt tag version matching to also accept, for example, v2014.7. #464 * Properly detect Amazon AMI's >= 2014.9. #468
* Fix the EPEL 7 URL since epel-release is now 7.2
Version 2014.09.09: Version 2014.09.09:
* Distro Support Fixes: * Distro Support Fixes:

4
README.rst
View file

@ -107,8 +107,8 @@ To install a specific branch from a git fork:
.. code:: console .. code:: console
curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com curl -o install_salt.sh -L https://bootstrap.saltstack.com
sudo sh install_salt.sh.sh -g https://github.com/myuser/salt.git git mybranch sudo sh install_salt.sh -g https://github.com/myuser/salt.git git mybranch
Installing via an Insecure One-Liner Installing via an Insecure One-Liner

4
bootstrap-salt.sh
View file

@ -774,6 +774,10 @@ __gather_linux_system_info() {
rv="$(__unquote_string "$(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g')")" rv="$(__unquote_string "$(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g')")"
[ "${rv}" != "" ] && v=$(__parse_version_string "$rv") || v="" [ "${rv}" != "" ] && v=$(__parse_version_string "$rv") || v=""
case $(echo "${nn}" | tr '[:upper:]' '[:lower:]') in case $(echo "${nn}" | tr '[:upper:]' '[:lower:]') in
amzn )
# Amazon AMI's after 2014.9 match here
n="Amazon Linux AMI"
;;
arch ) arch )
n="Arch Linux" n="Arch Linux"
v="" # Arch Linux does not provide a version. v="" # Arch Linux does not provide a version.