From a9e2e745c185019d4ba3666c3c470dd35beec894 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 21 Feb 2014 09:53:42 +0000 Subject: [PATCH 1/7] Start detecting the upcoming Debian 8 (Jessie). Refs #327. --- bootstrap-salt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 913cfbb..40e813a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -727,6 +727,9 @@ __gather_linux_system_info() { if [ "$(cat /etc/debian_version)" = "wheezy/sid" ]; then # I've found an EC2 wheezy image which did not tell its version v=$(__parse_version_string "7.0") + elif [ "$(cat /etc/debian_version)" = "jessie/sid" ]; then + # Let's start detecting the upcoming Debian 8 (Jessie) + v=$(__parse_version_string "8.0") fi else echowarn "Unable to parse the Debian Version" From 4bfbadb1b45a8579f73bb63b06725d679a10ee79 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:21:39 +0000 Subject: [PATCH 2/7] Add Debian 8 Support. Thank You Boris Feld(@Lothiraldan). --- bootstrap-salt.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 40e813a..ffdbfa3 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1794,6 +1794,11 @@ _eof return 0 } +install_debian_8_deps() { + install_debian_7_deps || return 1 + return 0 +} + install_debian_git_deps() { if [ $_START_DAEMONS -eq $BS_FALSE ]; then echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." @@ -1862,6 +1867,11 @@ install_debian_7_git_deps() { return 0 } +install_debian_8_git_deps() { + install_debian_7_git_deps || return 1 + return 0 +} + __install_debian_stable() { packages="" if [ $_INSTALL_MINION -eq $BS_TRUE ]; then @@ -1897,6 +1907,11 @@ install_debian_7_stable() { return 0 } +install_debian_8_stable() { + __install_debian_stable || return 1 + return 0 +} + install_debian_git() { if [ $_PIP_ALLOWED -eq $BS_TRUE ]; then # Building pyzmq from source to build it against libzmq3. @@ -1923,6 +1938,11 @@ install_debian_7_git() { return 0 } +install_debian_8_git() { + install_debian_git || return 1 + return 0 +} + install_debian_git_post() { for fname in minion master syndic; do From d0cc91471b0dfa5b624f6703b5c70d898f25c6dd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:23:15 +0000 Subject: [PATCH 3/7] Update changes log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 21c6a3b..50085a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Version 2014.xx.xx: * Fixed a bug on the services enabled function searching logic. * Arch, Fedora, openSUSE and SuSE now check for services enabled, if using systemd * CentOS(and any RedHat based) and Ubuntu now check for services enabled is using upstart + * Distro Support Added: + * Debian 8. Thank You Boris Feld(Lothiraldan). Version 2014.02.19: From bdae6e866df358e63af747119f5f9b4c4c7a9e85 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:23:48 +0000 Subject: [PATCH 4/7] Add Boris Feld(@Lothiraldan) to authors. Fixes #327. --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index fdbce32..e8e82c5 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -10,6 +10,7 @@ Name Nick Email Alec Koumjian akoumjian akoumjian@gmail.com Alex Van't Hof alexvh Angelo Gründler plueschopath angelo.gruendler@w1r3.net +Boris Feld Lothiraldan bruce-one bruce-one Chris Rebert cvrebert chris.rebert@hulu.com Christer Edwards cedwards From 24f9bae39de82abb84e1fdb9c8e39b6306ba695f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:28:39 +0000 Subject: [PATCH 5/7] Stable Debian 8 installs are not available(no packages) --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ffdbfa3..5350b3f 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1907,7 +1907,7 @@ install_debian_7_stable() { return 0 } -install_debian_8_stable() { +install_debian_8_stable__disabled() { __install_debian_stable || return 1 return 0 } From b48e2abb94ef9affb528b98682535e78d6af4c48 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:29:19 +0000 Subject: [PATCH 6/7] Add Debian (git installations only) to supported --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 5211e87..82a2ca8 100644 --- a/README.rst +++ b/README.rst @@ -353,7 +353,7 @@ Supported Operating Systems - Amazon Linux 2012.09 - Arch - CentOS 5/6 -- Debian 6.x/7.x +- Debian 6.x/7.x/8(git installations only) - Fedora 17/18 - FreeBSD 9.1/9.2/10 - Gentoo From 70ea23fd67590f97abf9314dc4149f0993bbbe1e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 25 Feb 2014 19:31:19 +0000 Subject: [PATCH 7/7] Disable the stable deps function instead --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5350b3f..2f2ba86 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1794,7 +1794,7 @@ _eof return 0 } -install_debian_8_deps() { +install_debian_8_deps__DISABLED() { install_debian_7_deps || return 1 return 0 } @@ -1907,7 +1907,7 @@ install_debian_7_stable() { return 0 } -install_debian_8_stable__disabled() { +install_debian_8_stable() { __install_debian_stable || return 1 return 0 }