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

Add Ubuntu 18.04 support

Browse source 
Fixes #1225
This commit is contained in:
rallytime 2018-05-10 15:56:48 -04:00
parent 0d502f2272
commit 22a7bc373a
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -276,7 +276,7 @@ Ubuntu and derivatives
- KDE neon (based on Ubuntu 16.04) - KDE neon (based on Ubuntu 16.04)
- Linux Mint 17/18 - Linux Mint 17/18
- Ubuntu 14.04/16.04 and subsequent non-TLS releases (see below) - Ubuntu 14.04/16.04/18.04 and subsequent non-LTS releases (see below)
Ubuntu Best Effort Support: Non-LTS Releases Ubuntu Best Effort Support: Non-LTS Releases
******************************************** ********************************************

15
bootstrap-salt.sh
View file

@ -1373,6 +1373,9 @@ __ubuntu_codename_translation() {
"17") "17")
DISTRO_CODENAME="artful" DISTRO_CODENAME="artful"
;; ;;
"18")
DISTRO_CODENAME="bionic"
;;
*) *)
DISTRO_CODENAME="trusty" DISTRO_CODENAME="trusty"
;; ;;
@ -2568,13 +2571,17 @@ __enable_universe_repository() {
__install_saltstack_ubuntu_repository() { __install_saltstack_ubuntu_repository() {
# Workaround for latest non-LTS ubuntu # Workaround for latest non-LTS ubuntu
if [ "$DISTRO_MAJOR_VERSION" -gt 16 ]; then if [ "$DISTRO_MAJOR_VERSION" -eq 17 ]; then
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages from latest LTS release. You may experience problems." echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for 16.04 LTS release. You may experience problems."
UBUNTU_VERSION=16.04 UBUNTU_VERSION=16.04
UBUNTU_CODENAME="xenial" UBUNTU_CODENAME="xenial"
elif [ "$DISTRO_MAJOR_VERSION" -gt 18 ]; then
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems."
UBUNTU_VERSION=18.04
UBUNTU_CODENAME="bionic"
else else
UBUNTU_VERSION=$DISTRO_VERSION UBUNTU_VERSION=${DISTRO_VERSION}
UBUNTU_CODENAME=$DISTRO_CODENAME UBUNTU_CODENAME=${DISTRO_CODENAME}
fi fi
__PACKAGES='' __PACKAGES=''