From 139583befdbfe9d3c6924eb9e8f2c886399707dd Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Fri, 13 Jul 2018 14:26:10 -0400
Subject: [PATCH] Make some initial preparations for Ubuntu 18.10 support

Ubuntu 18.10 is not released yet, but we can make some small changes now
to make the script a little more robust for when it is released.
---
 README.rst        | 4 ++--
 bootstrap-salt.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 60c7bed..3c606b4 100644
--- a/README.rst
+++ b/README.rst
@@ -286,8 +286,8 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
 bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
 release instead.
 
-For example, when installing Salt on Ubuntu 17.10, the bootstrap script will setup the repository
-for Ubuntu 16.04 from `SaltStack's Ubuntu repository`_ and install the 16.04 packages.
+For example, when installing Salt on Ubuntu 18.10, the bootstrap script will setup the repository
+for Ubuntu 18.04 from `SaltStack's Ubuntu repository`_ and install the 18.04 packages.
 
 Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
 `Ubuntu's release schedule`_.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1e70776..af82ef6 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2573,7 +2573,7 @@ __enable_universe_repository() {
 
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS ubuntu
-    if [ "$DISTRO_MAJOR_VERSION" -gt 18 ]; then
+    if [ "$DISTRO_MAJOR_VERSION" -gt 18 ] || [ "${DISTRO_VERSION}" -eq "18.10" ]; 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"