From ca7a90d00eef53ca73169e6d098a2ef062b2423a Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Fri, 8 Sep 2017 09:41:14 +0300 Subject: [PATCH] Fix #1142: allow git install on Raspbian 9 --- README.rst | 4 ++-- bootstrap-salt.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 58cb6d0..3951187 100644 --- a/README.rst +++ b/README.rst @@ -206,7 +206,7 @@ listed on the official supported operating systems document, the level of suppor Since Salt is written in Python, the packages available from `SaltStack's corporate repository`_ are CPU architecture independent and could be installed on any hardware supported by Linux kernel. However, SaltStack does package Salt's binary dependencies only for ``x86_64`` (``amd64``) and -``AArch32`` (``armhf``), which is limited for Debian/Raspbian 8 platforms. +``AArch32`` (``armhf``). The latter is available only for Debian/Raspbian 8 platforms. It is recommended to use ``git`` bootstrap mode as described above to install Salt on other architectures, such as ``x86`` (``i386``), ``AArch64`` (``arm64``) or ``ARM EABI`` (``armel``). @@ -232,7 +232,7 @@ Debian and derivatives - 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``) +- Raspbian 8 (``armhf`` packages) and 9 (using ``git`` installation mode only) Debian Best Effort Support: Testing Release ******************************************* diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index fefd736..bb3fd09 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1408,6 +1408,7 @@ __debian_derivatives_translation() { kali_1_debian_base="7.0" linuxmint_1_debian_base="8.0" raspbian_8_debian_base="8.0" + raspbian_9_debian_base="9.0" # Translate Debian derivatives to their base Debian version match=$(echo "$DISTRO_NAME_L" | egrep ${DEBIAN_DERIVATIVES}) @@ -1432,7 +1433,7 @@ __debian_derivatives_translation() { ;; esac - _debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base") + _debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base" 2>/dev/null) if [ "$_debian_version" != "" ]; then echodebug "Detected Debian $_debian_version derivative"