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 pull request #1426 from vernondcole/ubuntu_20_04

Browse source 
first changes to support Ubuntu 20.04
This commit is contained in:
Pedro Algarvio 2020-02-08 22:17:48 +00:00 • committed by GitHub
commit 4ac2a6b112
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrap-salt.sh
View file

@ -1446,6 +1446,9 @@ __ubuntu_codename_translation() {
"18") "18")
DISTRO_CODENAME="bionic" DISTRO_CODENAME="bionic"
;; ;;
"20")
DISTRO_CODENAME="focal"
;;
*) *)
DISTRO_CODENAME="trusty" DISTRO_CODENAME="trusty"
;; ;;
@ -2578,7 +2581,7 @@ __install_pip_pkgs() {
if ! __check_command_exists "${_pip_cmd} --version"; then if ! __check_command_exists "${_pip_cmd} --version"; then
__PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc" __PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if [ "$DISTRO_NAME_L" = "debian" ];then if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_NAME_L" = "ubuntu" ];then
__PACKAGES="${__PACKAGES} ${_py_pkg}-dev" __PACKAGES="${__PACKAGES} ${_py_pkg}-dev"
__apt_get_install_noinput ${__PACKAGES} || return 1 __apt_get_install_noinput ${__PACKAGES} || return 1
else else
@ -2872,9 +2875,9 @@ __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 18 ] || \ if [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems." echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
UBUNTU_VERSION=18.04 UBUNTU_VERSION=18.04
UBUNTU_CODENAME="bionic" UBUNTU_CODENAME="bionic"
else else