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

Support bootstrapping on upcoming Debian GNU/Linux 9.0

Browse source
This commit is contained in:
Denys Havrysh 2017-06-07 11:07:08 +03:00
parent 1bc17a6fa6
commit eaa387b985
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -226,7 +226,7 @@ Debian and derivatives
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
- Cumulus Linux 2/3 - Cumulus Linux 2/3
- Debian GNU/Linux 7/8 - Debian GNU/Linux 7/8/9
- Linux Mint Debian Edition 1 (based on Debian 8) - Linux Mint Debian Edition 1 (based on Debian 8)
- Kali Linux 1.0 (based on Debian 7) - Kali Linux 1.0 (based on Debian 7)
- Raspbian 8 (``armhf``) - Raspbian 8 (``armhf``)

14
bootstrap-salt.sh
View file

@ -1712,14 +1712,18 @@ if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ "$_VIRTUALENV_DIR" != "null" ]); the
fi fi
# Only Ubuntu has support for pip installing all packages # 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" echoerror "${DISTRO_NAME} does not have -a support"
exit 1 exit 1
fi 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" 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 if [ "${DISTRO_VERSION}" = "16.10" ] || [ "$DISTRO_MAJOR_VERSION" -gt 16 ]; then
GNUPG_CURL="gnupg1-curl" GNUPG_CURL="gnupg1-curl"
fi fi
@ -2910,12 +2914,14 @@ install_ubuntu_check_services() {
__install_saltstack_debian_repository() { __install_saltstack_debian_repository() {
if [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then if [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
DEBIAN_CODENAME="wheezy" DEBIAN_CODENAME="wheezy"
DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
else else
DEBIAN_CODENAME="jessie" DEBIAN_CODENAME="jessie"
DEBIAN_RELEASE="8"
fi fi
# amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location # 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" echo "deb $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
if [ "$HTTP_VAL" = "https" ] ; then if [ "$HTTP_VAL" = "https" ] ; then