From 20d88f2f1fca57c7f0a7e210a07c6ac493eca994 Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 4 Jan 2017 09:32:34 -0500 Subject: [PATCH] Simplify ubuntu version check to look for "16.10" --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ea2cd48..61ee98e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2404,7 +2404,7 @@ install_ubuntu_stable_deps() { # Versions starting with 2015.5.6, 2015.8.1 and 2016.3.0 are hosted at repo.saltstack.com if [ "$(echo "$STABLE_REV" | egrep '^(2015\.5|2015\.8|2016\.3|2016\.11|latest|archive\/)')" != "" ]; then # Workaround for latest non-LTS ubuntu - if [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; then + if [ "$DISTRO_VERSION" = "16.10" ]; then echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages from latest LTS release. You may experience problems." UBUNTU_VERSION=16.04 UBUNTU_CODENAME=xenial