From eaa387b9850f18235d881a7d1670288c2365ac8e Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Wed, 7 Jun 2017 11:07:08 +0300
Subject: [PATCH 1/2] Support bootstrapping on upcoming Debian GNU/Linux 9.0

---
 README.rst        |  2 +-
 bootstrap-salt.sh | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index e467e25..c81304d 100644
--- a/README.rst
+++ b/README.rst
@@ -226,7 +226,7 @@ Debian and derivatives
 ~~~~~~~~~~~~~~~~~~~~~~
 
 - Cumulus Linux 2/3
-- Debian GNU/Linux 7/8
+- Debian GNU/Linux 7/8/9
 - Linux Mint Debian Edition 1 (based on Debian 8)
 - Kali Linux 1.0 (based on Debian 7)
 - Raspbian 8 (``armhf``)
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index f06e48e..05fe005 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1712,14 +1712,18 @@ if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ "$_VIRTUALENV_DIR" != "null" ]); the
 fi
 
 # Only Ubuntu has support for pip installing all packages
-if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ $_PIP_ALL -eq $BS_TRUE ]);then
+if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ $_PIP_ALL -eq $BS_TRUE ]); then
     echoerror "${DISTRO_NAME} does not have -a support"
     exit 1
 fi
 
-# Starting from Ubuntu 16.10, gnupg-curl has been renamed to gnupg1-curl.
+# Starting from Debian 9 and Ubuntu 16.10, gnupg-curl has been renamed to gnupg1-curl.
 GNUPG_CURL="gnupg-curl"
-if [ "${DISTRO_NAME_L}" = "ubuntu" ]; then
+if [ "$DISTRO_NAME_L" = "debian" ]; then
+    if [ "$DISTRO_MAJOR_VERSION" -gt 8 ]; then
+        GNUPG_CURL="gnupg1-curl"
+    fi
+elif [ "$DISTRO_NAME_L" = "ubuntu" ]; then
     if [ "${DISTRO_VERSION}" = "16.10" ] || [ "$DISTRO_MAJOR_VERSION" -gt 16 ]; then
         GNUPG_CURL="gnupg1-curl"
     fi
@@ -2910,12 +2914,14 @@ install_ubuntu_check_services() {
 __install_saltstack_debian_repository() {
     if [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
         DEBIAN_CODENAME="wheezy"
+        DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
     else
         DEBIAN_CODENAME="jessie"
+        DEBIAN_RELEASE="8"
     fi
 
     # amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
-    SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DISTRO_MAJOR_VERSION}/${__REPO_ARCH}/${STABLE_REV}"
+    SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
     echo "deb $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
 
     if [ "$HTTP_VAL" = "https" ] ; then

From b41c3056b7e2ab5db1d04d268d8b9f60bb2f20dc Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Mon, 12 Jun 2017 11:55:01 +0300
Subject: [PATCH 2/2] Fix comment about Debian EOL releases

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 05fe005..780a9c7 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1450,7 +1450,7 @@ __debian_derivatives_translation() {
 __check_end_of_life_versions() {
     case "${DISTRO_NAME_L}" in
         debian)
-            # Debian versions bellow 6 are not supported
+            # Debian versions below 7 are not supported
             if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"