saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1421 from s0undt3ch/develop

Browse source 
Final changes for stable release
This commit is contained in:
Pedro Algarvio 2020-01-29 17:01:49 +00:00 • committed by GitHub
commit d50fa17a49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.pre-commit-config.yaml
View file

@ -10,7 +10,6 @@ repos:
- id: mixed-line-ending # Replaces or checks mixed line ending.
args: [--fix=lf]
- id: end-of-file-fixer # Makes sure files end in a newline and only a newline.
- id: check-merge-conflict # Check for files that contain merge conflict strings.
- repo: local
hooks:

16
ChangeLog
View file

@ -1,14 +1,18 @@
Version TBD (In Progress on the Develop Branch):
Version 2020.01.29:
* FreeBSD fixes (cedwards) #1413
* Support the upcoming Neon release (s0undt3ch) #1420
Version 2020.01.21:
* FreeBSD fixes (kgbsd) #1376
* Fix macOS support (s0undt3ch) #1397
* FreeBSD fixes (kgbsd) #1376
* Fix macOS support (s0undt3ch) #1397
Version 2019.11.04:
* Fix busybox mktemp compatibility (stanzgy) #1369
* Install debian 10 packages on debian 10 instead of 9 (kiemlicz) #1375
* move centos to python36, use python specified by -x (Ch3LL,bryceml) #1380
* Add debian 10 git install support (Ch3LL) #1378
* Fix busybox mktemp compatibility (stanzgy) #1369
* Install debian 10 packages on debian 10 instead of 9 (kiemlicz) #1375
* move centos to python36, use python specified by -x (Ch3LL,bryceml) #1380
* Add debian 10 git install support (Ch3LL) #1378
Version 2019.10.03:
* Fix possible typo with `gnupg-curl` vs `gnupg curl` (zahiar)

2
README.rst
View file

@ -329,7 +329,7 @@ UNIX systems
**BSD**:
- OpenBSD (``pip`` installation)
- FreeBSD 9/10/11/12
- FreeBSD 11/12
**SunOS**:

9
bootstrap-salt.sh
View file

@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2020.01.21"
__ScriptVersion="2020.01.29"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0"
@ -1688,10 +1688,9 @@ __check_end_of_life_versions() {
;;
freebsd)
# FreeBSD versions lower than 9.1 are not supported.
if { [ "$DISTRO_MAJOR_VERSION" -eq 9 ] && [ "$DISTRO_MINOR_VERSION" -lt 01 ]; } || \
[ "$DISTRO_MAJOR_VERSION" -lt 9 ]; then
echoerror "Versions lower than FreeBSD 9.1 are not supported."
# FreeBSD versions lower than 11 are EOL
if [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
echoerror "Versions lower than FreeBSD 11 are EOL and no longer supported."
exit 1
fi
;;