Merge pull request #345 from s0undt3ch/develop

Add Scientific Linux Support

ChangeLog

@@ -1,6 +1,8 @@
 Version 2014.XX.XX:
 	* Fixed a bug for RHEL 6 based distributions where yum-utils was not getting installed.
-	* Allow detection of and installation on Oracle Linux systems
+	* Distro Support Addded:
+		* Oracle Linux
+		* Scientific Linux
 
 Version 2014.03.10-1:
 	* Distro Support Fixed:

README.rst

@@ -365,6 +365,7 @@ Supported Operating Systems
 - Oracle Linux 5/5
 - Red Hat 5/6
 - Red Hat Enterprise 5/6
+- Scientific Linux 5/6
 - SmartOS
 - SuSE 11 SP1/11 SP2
 - Ubuntu 10.x/11.x/12.x/13.04/13.10

bootstrap-salt.sh

@@ -642,15 +642,15 @@ __gather_linux_system_info() {
     rv=$(lsb_release >/dev/null 2>&1)
     if [ $? -eq 0 ]; then
         DISTRO_NAME=$(lsb_release -si)
-        if [ "x$(echo "$DISTRO_NAME" | grep RedHat)" != "x" ]; then
+        if [ "${DISTRO_NAME}" = "Scientific" ]; then
+            DISTRO_NAME="Scientific Linux"
+        elif [ "x$(echo "$DISTRO_NAME" | grep RedHat)" != "x" ]; then
             # Let's convert CamelCase to Camel Case
             DISTRO_NAME=$(__camelcase_split "$DISTRO_NAME")
-        fi
-        if [ "${DISTRO_NAME}" = "openSUSE project" ]; then
+        elif [ "${DISTRO_NAME}" = "openSUSE project" ]; then
             # lsb_release -si returns "openSUSE project" on openSUSE 12.3
             DISTRO_NAME="opensuse"
-        fi
-        if [ "${DISTRO_NAME}" = "SUSE LINUX" ]; then
+        elif [ "${DISTRO_NAME}" = "SUSE LINUX" ]; then
             # lsb_release -si returns "SUSE LINUX" on SLES 11 SP3
             DISTRO_NAME="suse"
         fi
@@ -685,6 +685,8 @@ __gather_linux_system_info() {
             redhat             )
                 if [ ".$(egrep 'CentOS' /etc/${rsource})" != . ]; then
                     n="CentOS"
+                elif [ ".$(egrep 'Scientific' /etc/${rsource})" != . ]; then
+                    n="Scientific Linux"
                 elif [ ".$(egrep 'Red Hat Enterprise Linux' /etc/${rsource})" != . ]; then
                     n="<R>ed <H>at <E>nterprise <L>inux"
                 else
@@ -2581,6 +2583,7 @@ install_red_hat_enterprise_workstation_testing_post() {
 #
 #######################################################################################################################
 
+
 #######################################################################################################################
 #
 #   Oracle Linux Install Functions
@@ -2646,6 +2649,71 @@ install_oracle_linux_check_services() {
 #######################################################################################################################
 
 
+#######################################################################################################################
+#
+#   Scientific Linux Install Functions
+#
+install_scientific_linux_stable_deps() {
+    install_centos_stable_deps || return 1
+    return 0
+}
+
+install_scientific_linux_git_deps() {
+    install_centos_git_deps || return 1
+    return 0
+}
+
+install_scientific_linux_testing_deps() {
+    install_centos_testing_deps || return 1
+    return 0
+}
+
+install_scientific_linux_stable() {
+    install_centos_stable || return 1
+    return 0
+}
+
+install_scientific_linux_git() {
+    install_centos_git || return 1
+    return 0
+}
+
+install_scientific_linux_testing() {
+    install_centos_testing || return 1
+    return 0
+}
+
+install_scientific_linux_stable_post() {
+    install_centos_stable_post || return 1
+    return 0
+}
+
+install_scientific_linux_git_post() {
+    install_centos_git_post || return 1
+    return 0
+}
+
+
+install_scientific_linux_testing_post() {
+    install_centos_testing_post || return 1
+    return 0
+}
+
+install_scientific_linux_restart_daemons() {
+    install_centos_restart_daemons || return 1
+    return 0
+}
+
+install_scientific_linux_check_services() {
+    install_centos_check_services || return 1
+    return 0
+}
+#
+#   Ended Scientific Linux Install Functions
+#
+#######################################################################################################################
+
+
 #######################################################################################################################
 #
 #   Amazon Linux AMI Install Functions