vagrant-salt 0.3.2 → 0.4.0

data/scripts/bootstrap-salt-minion.sh

@@ -1,26 +1,112 @@
-#!/bin/bash -
+#!/bin/sh -
 #===============================================================================
 # vim: softtabstop=4 shiftwidth=4 expandtab fenc=utf-8 spell spelllang=en
 #===============================================================================
 #
-#          FILE: bootstrap-salt-minion.sh
+#          FILE: bootstrap-salt.sh
 #
 #   DESCRIPTION: Bootstrap salt installation for various systems/distributions
 #
 #          BUGS: https://github.com/saltstack/salty-vagrant/issues
 #        AUTHOR: Pedro Algarvio (s0undt3ch), pedro@algarvio.me
 #                Alec Koumjian (akoumjian), akoumjian@gmail.com
+#                Geoff Garside (geoffgarside), geoff@geoffgarside.co.uk
+#       LICENSE: Apache 2.0
 #  ORGANIZATION: Salt Stack (saltstack.org)
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #===============================================================================
 set -o nounset                              # Treat unset variables as an error
-ScriptVersion="1.1"
-ScriptName="bootstrap-salt-minion.sh"
+ScriptVersion="1.5.2"
+ScriptName="bootstrap-salt.sh"
+
+#===============================================================================
+#  Environment variables taken into account.
+#-------------------------------------------------------------------------------
+#   * BS_COLORS:          If 0 disables colour support
+#   * BS_PIP_ALLOWED:     If 1 enable pip based installations(if needed)
+#   * BS_ECHO_DEBUG:      If 1 enable debug echo which can also be set by -D
+#   * BS_SALT_ETC_DIR:    Defaults to /etc/salt
+#   * BS_FORCE_OVERWRITE: Force overriding copied files(config, init.d, etc)
+#===============================================================================
+
 
 #===============================================================================
 #  LET THE BLACK MAGIC BEGIN!!!!
 #===============================================================================
 
+
+# Bootstrap script truth values
+BS_TRUE=1
+BS_FALSE=0
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __detect_color_support
+#   DESCRIPTION:  Try to detect color support.
+#-------------------------------------------------------------------------------
+COLORS=${BS_COLORS:-$(tput colors 2>/dev/null || echo 0)}
+__detect_color_support() {
+    if [ $? -eq 0 ] && [ "$COLORS" -gt 2 ]; then
+        RC="\033[1;31m"
+        GC="\033[1;32m"
+        BC="\033[1;34m"
+        YC="\033[1;33m"
+        EC="\033[0m"
+    else
+        RC=""
+        GC=""
+        BC=""
+        YC=""
+        EC=""
+    fi
+}
+__detect_color_support
+
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  echoerr
+#   DESCRIPTION:  Echo errors to stderr.
+#-------------------------------------------------------------------------------
+echoerror() {
+    printf "${RC} * ERROR${EC}: $@\n" 1>&2;
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  echoinfo
+#   DESCRIPTION:  Echo information to stdout.
+#-------------------------------------------------------------------------------
+echoinfo() {
+    printf "${GC} *  INFO${EC}: %s\n" "$@";
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  echowarn
+#   DESCRIPTION:  Echo warning informations to stdout.
+#-------------------------------------------------------------------------------
+echowarn() {
+    printf "${YC} *  WARN${EC}: %s\n" "$@";
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  echodebug
+#   DESCRIPTION:  Echo debug information to stdout.
+#-------------------------------------------------------------------------------
+echodebug() {
+    if [ $ECHO_DEBUG -eq $BS_TRUE ]; then
+        printf "${BC} * DEBUG${EC}: %s\n" "$@";
+    fi
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  pip_not_allowed
+#   DESCRIPTION:  Simple function to let the users know that -P needs to be
+#                 used.
+#-------------------------------------------------------------------------------
+pip_not_allowed() {
+    echoerror "pip based installations were not allowed. Retry using '-P'"
+    usage
+    exit 1
+}
+
 #===  FUNCTION  ================================================================
 #         NAME:  usage
 #  DESCRIPTION:  Display usage information.
@@ -44,9 +130,23 @@ usage() {
     $ ${ScriptName} git 8c3fadf15ec183e5ce8c63739850d543617e4357
 
   Options:
-  -h|help       Display this message
-  -v|version    Display script version
-  -c|config-dir Temporary minion configuration directory
+  -h  Display this message
+  -v  Display script version
+  -n  No colours.
+  -D  Show debug output.
+  -c  Temporary configuration directory
+  -M  Also install salt-master
+  -S  Also install salt-syndic
+  -N  Do not install salt-minion
+  -C  Only run the configuration function. This option automaticaly
+      bypasses any installation.
+  -P  Allow pip based installations. On some distributions the required salt
+      packages or it's dependencies are not available as a package for that
+      distribution. Using this flag allows the script to use pip as a last
+      resort method. NOTE: This works for functions which actually implement
+      pip based installations.
+  -F  Allow copied files to overwrite existing(config, init.d, etc)
+
 EOT
 }   # ----------  end of function usage  ----------
 
@@ -54,34 +154,73 @@ EOT
 #  Handle command line arguments
 #-----------------------------------------------------------------------
 TEMP_CONFIG_DIR="null"
-
-while getopts ":hvc:" opt
+INSTALL_MASTER=$BS_FALSE
+INSTALL_SYNDIC=$BS_FALSE
+INSTALL_MINION=$BS_TRUE
+ECHO_DEBUG=${BS_ECHO_DEBUG:-$BS_FALSE}
+CONFIG_ONLY=$BS_FALSE
+PIP_ALLOWED=${BS_PIP_ALLOWED:-$BS_FALSE}
+SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/etc/salt}
+FORCE_OVERWRITE=${BS_FORCE_OVERWRITE:-$BS_FALSE}
+
+while getopts ":hvnDc:MSNCP" opt
 do
-  case $opt in
-
-    h|help          )  usage; exit 0   ;;
-
-    v|version       )  echo "$0 -- Version $ScriptVersion"; exit 0   ;;
-    c|config-dir    )  TEMP_CONFIG_DIR="$OPTARG" ;;
-
-    \?              )  echo "\n  Option does not exist : $OPTARG\n"
-                       usage; exit 1   ;;
+  case "${opt}" in
+
+    h )  usage; exit 0                                  ;;
+
+    v )  echo "$0 -- Version $ScriptVersion"; exit 0    ;;
+    n )  COLORS=0; __detect_color_support               ;;
+    D )  ECHO_DEBUG=$BS_TRUE                            ;;
+    c )  TEMP_CONFIG_DIR="$OPTARG"
+         # If the configuration directory does not exist, error out
+         if [ ! -d "$TEMP_CONFIG_DIR" ]; then
+             echoerror "The configuration directory ${TEMP_CONFIG_DIR} does not exist."
+             exit 1
+         fi
+         ;;
+    M )  INSTALL_MASTER=$BS_TRUE                        ;;
+    S )  INSTALL_SYNDIC=$BS_TRUE                        ;;
+    N )  INSTALL_MINION=$BS_FALSE                       ;;
+    C )  CONFIG_ONLY=$BS_TRUE                           ;;
+    P )  PIP_ALLOWED=$BS_TRUE                           ;;
+    F )  FORCE_OVERWRITE=$BS_TRUE                       ;;
+
+    \?)  echo
+         echoerror "Option does not exist : $OPTARG"
+         usage
+         exit 1
+         ;;
 
   esac    # --- end of case ---
 done
 shift $(($OPTIND-1))
 
+
 __check_unparsed_options() {
     shellopts="$1"
     unparsed_options=$( echo "$shellopts" | grep -E '[-]+[[:alnum:]]' )
     if [ "x$unparsed_options" != "x" ]; then
         usage
         echo
-        echo " * ERROR: options come before install arguments"
+        echoerror "options are only allowed before install arguments"
         echo
         exit 1
     fi
 }
+
+
+# Check that we're actually installing one of minion/master/syndic
+if [ $INSTALL_MINION -eq $BS_FALSE ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+    echowarn "Nothing to install or configure"
+    exit 0
+fi
+
+if [ $CONFIG_ONLY -eq $BS_TRUE ] && [ "$TEMP_CONFIG_DIR" = "null" ]; then
+    echoerror "In order to run the script in configuration only mode you also need to provide the configuration directory."
+    exit 1
+fi
+
 # Define installation type
 if [ "$#" -eq 0 ];then
     ITYPE="stable"
@@ -91,11 +230,13 @@ else
     shift
 fi
 
-if [ "$ITYPE" != "stable" -a "$ITYPE" != "daily" -a "$ITYPE" != "git" ]; then
-    echo " ERROR: Installation type \"$ITYPE\" is not known..."
+# Check installation type
+if [ "$ITYPE" != "stable" ] && [ "$ITYPE" != "daily" ] && [ "$ITYPE" != "git" ]; then
+    echoerror "Installation type \"$ITYPE\" is not known..."
     exit 1
 fi
 
+# If doing a git install, check what branch/tag/sha will be checked out
 if [ $ITYPE = "git" ]; then
     if [ "$#" -eq 0 ];then
         GIT_REV="master"
@@ -106,30 +247,50 @@ if [ $ITYPE = "git" ]; then
     fi
 fi
 
+# Check for any unparsed arguments. Should be an error.
 if [ "$#" -gt 0 ]; then
     __check_unparsed_options "$*"
     usage
     echo
-    echo " * ERROR: Too many arguments."
+    echoerror "Too many arguments."
     exit 1
 fi
 
 # Root permissions are required to run this script
 if [ $(whoami) != "root" ] ; then
-    echo " * ERROR: Salt requires root privileges to install. Please re-run this script as root."
+    echoerror "Salt requires root privileges to install. Please re-run this script as root."
     exit 1
 fi
 
+CALLER=$(echo `ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' '` | cut -d ' ' -f 2)
+if [ "${CALLER}x" = "${0}x" ]; then
+    CALLER="PIPED THROUGH"
+fi
+echoinfo "${CALLER} ${0} -- Version ${ScriptVersion}"
+#echowarn "Running the unstable version of ${ScriptName}"
+
 
 #---  FUNCTION  ----------------------------------------------------------------
 #          NAME:  __exit_cleanup
 #   DESCRIPTION:  Cleanup any leftovers after script has ended
+#
+#
+#   http://www.unix.com/man-page/POSIX/1posix/trap/
+#
+#               Signal Number   Signal Name
+#               1               SIGHUP
+#               2               SIGINT
+#               3               SIGQUIT
+#               6               SIGABRT
+#               9               SIGKILL
+#              14               SIGALRM
+#              15               SIGTERM
 #-------------------------------------------------------------------------------
 __exit_cleanup() {
     EXIT_CODE=$?
 
     # Remove the logging pipe when the script exits
-    echo " * Removing the logging pipe $LOGPIPE"
+    echodebug "Removing the logging pipe $LOGPIPE"
     rm -f $LOGPIPE
 
     # Kill tee when exiting, CentOS, at least requires this
@@ -137,25 +298,24 @@ __exit_cleanup() {
 
     [ "x$TEE_PID" = "x" ] && exit $EXIT_CODE
 
-    echo " * Killing logging pipe tee's with pid(s): $TEE_PID"
+    echodebug "Killing logging pipe tee's with pid(s): $TEE_PID"
 
     # We need to trap errors since killing tee will cause a 127 errno
     # We also do this as late as possible so we don't "mis-catch" other errors
     __trap_errors() {
-        echo "Errors Trapped: $EXIT_CODE"
+        echoinfo "Errors Trapped: $EXIT_CODE"
         # Exit with the "original" exit code, not the trapped code
         exit $EXIT_CODE
     }
-    # Bash understands ERR trap signal, FreeBSD does not
-    trap "__trap_errors" ERR >/dev/null 2>&1 || trap "__trap_errors" INT KILL QUIT
+    trap "__trap_errors" INT QUIT ABRT KILL QUIT TERM
 
     # Now we're "good" to kill tee
-    kill -TERM $TEE_PID
+    kill -s TERM $TEE_PID
 
     # In case the 127 errno is not triggered, exit with the "original" exit code
     exit $EXIT_CODE
 }
-trap "__exit_cleanup" EXIT
+trap "__exit_cleanup" EXIT INT
 
 
 # Define our logging file and pipe paths
@@ -166,7 +326,7 @@ LOGPIPE="/tmp/$( echo $ScriptName | sed s/.sh/.logpipe/g )"
 # On FreeBSD we have to use mkfifo instead of mknod
 mknod $LOGPIPE p >/dev/null 2>&1 || mkfifo $LOGPIPE >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-    echo " * Failed to create the named pipe required to log"
+    echoerror "Failed to create the named pipe required to log"
     exit 1
 fi
 
@@ -188,6 +348,11 @@ exec 2>$LOGPIPE
 __gather_hardware_info() {
     if [ -f /proc/cpuinfo ]; then
         CPU_VENDOR_ID=$(cat /proc/cpuinfo | grep -E 'vendor_id|Processor' | head -n 1 | awk '{print $3}' | cut -d '-' -f1 )
+    elif [ -f /usr/bin/kstat ]; then
+        # SmartOS.
+        # Solaris!?
+        # This has only been tested for a GenuineIntel CPU
+        CPU_VENDOR_ID=$(/usr/bin/kstat -p cpu_info:0:cpu_info0:vendor_id | awk '{print $2}')
     else
         CPU_VENDOR_ID=$( sysctl -n hw.model )
     fi
@@ -231,6 +396,71 @@ __parse_version_string() {
 }
 
 
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __unquote_string
+#   DESCRIPTION:  Strip single or double quotes from the provided string.
+#-------------------------------------------------------------------------------
+__unquote_string() {
+    echo $@ | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __camelcase_split
+#   DESCRIPTION:  Convert CamelCased strings to Camel_Cased
+#-------------------------------------------------------------------------------
+__camelcase_split() {
+    echo $@ | sed -r 's/([^A-Z-])([A-Z])/\1 \2/g'
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __strip_duplicates
+#   DESCRIPTION:  Strip duplicate strings
+#-------------------------------------------------------------------------------
+__strip_duplicates() {
+    echo $@ | tr -s '[:space:]' '\n' | awk '!x[$0]++'
+}
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __sort_release_files
+#   DESCRIPTION:  Custom sort function. Alphabetical or numerical sort is not
+#                 enough.
+#-------------------------------------------------------------------------------
+__sort_release_files() {
+    KNOWN_RELEASE_FILES=$(echo "(arch|centos|debian|ubuntu|fedora|redhat|suse|\
+        mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|lsb|system|\
+        os)(-|_)(release|version)" | sed -r 's:[[:space:]]::g')
+    primary_release_files=""
+    secondary_release_files=""
+    # Sort know VS un-known files first
+    for release_file in $(echo $@ | sed -r 's:[[:space:]]:\n:g' | sort --unique --ignore-case); do
+        match=$(echo $release_file | egrep -i ${KNOWN_RELEASE_FILES})
+        if [ "x${match}" != "x" ]; then
+            primary_release_files="${primary_release_files} ${release_file}"
+        else
+            secondary_release_files="${secondary_release_files} ${release_file}"
+        fi
+    done
+
+    # Now let's sort by know files importance, max important goes last in the max_prio list
+    max_prio="redhat-release centos-release"
+    for entry in $max_prio; do
+        if [ "x$(echo ${primary_release_files} | grep $entry)" != "x" ]; then
+            primary_release_files=$(echo ${primary_release_files} | sed -e "s:\(.*\)\($entry\)\(.*\):\2 \1 \3:g")
+        fi
+    done
+    # Now, least important goes last in the min_prio list
+    min_prio="lsb-release"
+    for entry in $max_prio; do
+        if [ "x$(echo ${primary_release_files} | grep $entry)" != "x" ]; then
+            primary_release_files=$(echo ${primary_release_files} | sed -e "s:\(.*\)\($entry\)\(.*\):\1 \3 \2:g")
+        fi
+    done
+
+    # Echo the results collapsing multiple white-space into a single white-space
+    echo "${primary_release_files} ${secondary_release_files}" | sed -r 's:[[:space:]]:\n:g'
+}
+
+
 #---  FUNCTION  ----------------------------------------------------------------
 #          NAME:  __gather_linux_system_info
 #   DESCRIPTION:  Discover Linux system information
@@ -239,36 +469,52 @@ __gather_linux_system_info() {
     DISTRO_NAME=""
     DISTRO_VERSION=""
 
-    if [ -f /etc/lsb-release ]; then
+    # Let's test if the lsb_release binary is available
+    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
+            # Let's convert CamelCase to Camel Case
+            DISTRO_NAME=$(__camelcase_split "$DISTRO_NAME")
+        fi
+        rv=$(lsb_release -sr)
+        [ "${rv}x" != "x" ] && DISTRO_VERSION=$(__parse_version_string "$rv")
+    elif [ -f /etc/lsb-release ]; then
+        # We don't have the lsb_release binary, though, we do have the file it parses
         DISTRO_NAME=$(grep DISTRIB_ID /etc/lsb-release | sed -e 's/.*=//')
-        DISTRO_VERSION=$(__parse_version_string $(grep DISTRIB_RELEASE /etc/lsb-release | sed -e 's/.*=//'))
+        rv=$(grep DISTRIB_RELEASE /etc/lsb-release | sed -e 's/.*=//')
+        [ "${rv}x" != "x" ] && DISTRO_VERSION=$(__parse_version_string "$rv")
     fi
 
-    if [ "x$DISTRO_NAME" != "x" -a "x$DISTRO_VERSION" != "x" ]; then
+    if [ "x$DISTRO_NAME" != "x" ] && [ "x$DISTRO_VERSION" != "x" ]; then
         # We already have the distribution name and version
         return
     fi
 
-    for rsource in $(
+    for rsource in $(__sort_release_files $(
             cd /etc && /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \
             sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \
             echo redhat-release lsb-release
-            ); do
+            )); do
 
         [ -L "/etc/${rsource}" ] && continue        # Don't follow symlinks
         [ ! -f "/etc/${rsource}" ] && continue      # Does not exist
 
         n=$(echo ${rsource} | sed -e 's/[_-]release$//' -e 's/[_-]version$//')
-        v=$( __parse_version_string "$( (grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q' )" )
+        rv=$( (grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q' )
+        [ "${rv}x" = "x" ] && continue  # There's no version information. Continue to next rsource
+        v=$(__parse_version_string "$rv")
         case $(echo ${n} | tr '[:upper:]' '[:lower:]') in
-            redhat )
-                if [ ".$(egrep '(Red Hat Enterprise Linux|CentOS)' /etc/${rsource})" != . ]; then
+            redhat             )
+                if [ ".$(egrep 'CentOS' /etc/${rsource})" != . ]; then
+                    n="CentOS"
+                elif [ ".$(egrep 'Red Hat Enterprise Linux' /etc/${rsource})" != . ]; then
                     n="<R>ed <H>at <E>nterprise <L>inux"
                 else
                     n="<R>ed <H>at <L>inux"
                 fi
                 ;;
-            arch               ) n="Arch"           ;;
+            arch               ) n="Arch Linux"     ;;
             centos             ) n="CentOS"         ;;
             debian             ) n="Debian"         ;;
             ubuntu             ) n="Ubuntu"         ;;
@@ -279,6 +525,20 @@ __gather_linux_system_info() {
             slackware          ) n="Slackware"      ;;
             turbolinux         ) n="TurboLinux"     ;;
             unitedlinux        ) n="UnitedLinux"    ;;
+            system             )
+                while read -r line; do
+                    [ "${n}x" != "systemx" ] && break
+                    case "$line" in
+                        *Amazon*Linux*AMI*)
+                            n="Amazon Linux AMI"
+                            break
+                    esac
+                done < /etc/${rsource}
+                ;;
+            os                 )
+                n=$(__unquote_string $(grep '^NAME=' /etc/os-release | sed -e 's/^NAME=\(.*\)$/\1/g'))
+                [ "${n}" = "Arch Linux" ] && v=""   # Arch Linux does not provide a version.
+                ;;
             *                  ) n="${n}"           ;
         esac
         DISTRO_NAME=$n
@@ -293,13 +553,55 @@ __gather_linux_system_info() {
 #   DESCRIPTION:  Discover SunOS system info
 #-------------------------------------------------------------------------------
 __gather_sunos_system_info() {
-    DISTRO_NAME="Solaris"
-    DISTRO_VERSION=$(
-        echo "${OS_VERSION}" |
-        sed -e 's;^4\.;1.;' \
-            -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \
-            -e 's;^5\.\([0-9][0-9]*\).*;\1;'
-    )
+    if [ -f /sbin/uname ]; then
+        DISTRO_VERSION=$(/sbin/uname -X | grep -i kernelid | awk '{ print $3}')
+    fi
+
+    DISTRO_NAME=""
+    if [ -f /etc/release ]; then
+        while read -r line; do
+            [ "${DISTRO_NAME}x" != "x" ] && break
+            case "$line" in
+                *OpenIndiana*oi_[0-9]*)
+                    DISTRO_NAME="OpenIndiana"
+                    DISTRO_VERSION=$(echo "$line" | sed -nr "s/OpenIndiana(.*)oi_([[:digit:]]+)(.*)/\2/p")
+                    break
+                    ;;
+                *OpenSolaris*snv_[0-9]*)
+                    DISTRO_NAME="OpenSolaris"
+                    DISTRO_VERSION=$(echo "$line" | sed -nr "s/OpenSolaris(.*)snv_([[:digit:]]+)(.*)/\2/p")
+                    break
+                    ;;
+                *Oracle*Solaris*[0-9]*)
+                    DISTRO_NAME="Oracle Solaris"
+                    DISTRO_VERSION=$(echo "$line" | sed -nr "s/(Oracle Solaris) ([[:digit:]]+)(.*)/\2/p")
+                    break
+                    ;;
+                *Solaris*)
+                    DISTRO_NAME="Solaris"
+                    break
+                    ;;
+                *NexentaCore*)
+                    DISTRO_NAME="Nexenta Core"
+                    break
+                    ;;
+                *SmartOS*)
+                    DISTRO_NAME="SmartOS"
+                    break
+                    ;;
+            esac
+        done < /etc/release
+    fi
+
+    if [ "${DISTRO_NAME}x" = "x" ]; then
+        DISTRO_NAME="Solaris"
+        DISTRO_VERSION=$(
+            echo "${OS_VERSION}" |
+            sed -e 's;^4\.;1.;' \
+                -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \
+                -e 's;^5\.\([0-9][0-9]*\).*;\1;'
+        )
+    fi
 }
 
 
@@ -329,12 +631,77 @@ __gather_system_info() {
             __gather_bsd_system_info
             ;;
         * )
-            echo " * ERROR: $OS_NAME not supported.";
+            echoerror "${OS_NAME} not supported.";
             exit 1
             ;;
     esac
 
 }
+__gather_system_info
+
+
+echo
+echoinfo "System Information:"
+echoinfo "  CPU:          ${CPU_VENDOR_ID}"
+echoinfo "  CPU Arch:     ${CPU_ARCH}"
+echoinfo "  OS Name:      ${OS_NAME}"
+echoinfo "  OS Version:   ${OS_VERSION}"
+echoinfo "  Distribution: ${DISTRO_NAME} ${DISTRO_VERSION}"
+echo
+
+# Let users know what's going to be installed/configured
+if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+    if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+        echoinfo "Installing minion"
+    else
+        echoinfo "Configuring minion"
+    fi
+fi
+
+if [ $INSTALL_MASTER -eq $BS_TRUE ]; then
+    if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+        echoinfo "Installing master"
+    else
+        echoinfo "Configuring master"
+    fi
+fi
+
+if [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+    if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+        echoinfo "Installing syndic"
+    else
+        echoinfo "Configuring syndic"
+    fi
+fi
+
+# Simplify version naming on functions
+if [ "x${DISTRO_VERSION}" = "x" ]; then
+    DISTRO_MAJOR_VERSION=""
+    DISTRO_MINOR_VERSION=""
+    PREFIXED_DISTRO_MAJOR_VERSION=""
+    PREFIXED_DISTRO_MINOR_VERSION=""
+else
+    DISTRO_MAJOR_VERSION="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')"
+    DISTRO_MINOR_VERSION="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).\([0-9]*\).*/\2/g')"
+    PREFIXED_DISTRO_MAJOR_VERSION="_${DISTRO_MAJOR_VERSION}"
+    if [ "${PREFIXED_DISTRO_MAJOR_VERSION}" = "_" ]; then
+        PREFIXED_DISTRO_MAJOR_VERSION=""
+    fi
+    PREFIXED_DISTRO_MINOR_VERSION="_${DISTRO_MINOR_VERSION}"
+    if [ "${PREFIXED_DISTRO_MINOR_VERSION}" = "_" ]; then
+        PREFIXED_DISTRO_MINOR_VERSION=""
+    fi
+fi
+# Simplify distro name naming on functions
+DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -re 's/([[:space:]])+/_/g')
+
+
+# Only Ubuntu has daily packages, let's let users know about that
+if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ $ITYPE = "daily" ]) && \
+   ([ "${DISTRO_NAME_L}" != "trisquel" ] && [ $ITYPE = "daily" ]); then
+    echoerror "${DISTRO_NAME} does not have daily packages support"
+    exit 1
+fi
 
 
 #---  FUNCTION  ----------------------------------------------------------------
@@ -345,33 +712,13 @@ __gather_system_info() {
 #-------------------------------------------------------------------------------
 __function_defined() {
     FUNC_NAME=$1
-    if [ "${DISTRO_NAME}" = "centos" ]; then
-        if typeset -f $FUNC_NAME &>/dev/null ; then
-            echo " * INFO: Found function $FUNC_NAME"
-            return 0
-        fi
-    elif [ "${DISTRO_NAME}" = "ubuntu" ]; then
-        if $( type ${FUNC_NAME} | grep -q 'shell function' ); then
-            echo " * INFO: Found function $FUNC_NAME"
-            return 0
-        fi
-    # Last resorts try POSIXLY_CORRECT or not
-    elif test -n "${POSIXLY_CORRECT+yes}"; then
-        if typeset -f $FUNC_NAME >/dev/null 2>&1 ; then
-            echo " * INFO: Found function $FUNC_NAME"
-            return 0
-        fi
-    else
-        # Arch linux seems to fall here
-        if $( type ${FUNC_NAME}  >/dev/null 2>&1 ) ; then
-            echo " * INFO: Found function $FUNC_NAME"
-            return 0
-        fi
+    if [ "$(command -v $FUNC_NAME)x" != "x" ]; then
+        echoinfo "Found function $FUNC_NAME"
+        return 0
     fi
-    echo " * INFO: $FUNC_NAME not found...."
+    echodebug "$FUNC_NAME not found...."
     return 1
 }
-__gather_system_info
 
 
 #---  FUNCTION  ----------------------------------------------------------------
@@ -383,35 +730,77 @@ __git_clone_and_checkout() {
     SALT_GIT_CHECKOUT_DIR=/tmp/git/salt
     [ -d /tmp/git ] || mkdir /tmp/git
     cd /tmp/git
-    [ -d $SALT_GIT_CHECKOUT_DIR ] || git clone git://github.com/saltstack/salt.git salt
-    cd salt
-    git checkout $GIT_REV
+    if [ -d $SALT_GIT_CHECKOUT_DIR ]; then
+        cd $SALT_GIT_CHECKOUT_DIR
+        git fetch || return 1
+        # Tags are needed because of salt's versioning, also fetch that
+        git fetch --tags || return 1
+        git reset --hard $GIT_REV || return 1
+
+        # Just calling `git reset --hard $GIT_REV` on a branch name that has
+        # already been checked out will not update that branch to the upstream
+        # HEAD; instead it will simply reset to itself.  Check the ref to see
+        # if it is a branch name, check out the branch, and pull in the
+        # changes.
+        git branch -a | grep -q ${GIT_REV}
+        if [ $? -eq 0 ]; then
+            git pull --rebase || return 1
+        fi
+    else
+        git clone https://github.com/saltstack/salt.git salt || return 1
+        cd $SALT_GIT_CHECKOUT_DIR
+        git checkout $GIT_REV || return 1
+    fi
+    return 0
 }
 
 
-echo " * System Information:"
-echo "     CPU:          ${CPU_VENDOR_ID}"
-echo "     CPU Arch:     ${CPU_ARCH}"
-echo "     OS Name:      ${OS_NAME}"
-echo "     OS Version:   ${OS_VERSION}"
-echo "     Distribution: ${DISTRO_NAME} ${DISTRO_VERSION}"
-
-
-# Simplify version naming on functions
-if [ "x${DISTRO_VERSION}" = "x" ]; then
-    DISTRO_VERSION_NO_DOTS=""
-else
-    DISTRO_VERSION_NO_DOTS="_$(echo $DISTRO_VERSION | tr -d '.')"
-fi
-# Simplify distro name naming on functions
-DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -e 's|[:space:]+|_|g')
-
 #---  FUNCTION  ----------------------------------------------------------------
 #          NAME:  __apt_get_noinput
 #   DESCRIPTION:  (DRY) apt-get install with noinput options
 #-------------------------------------------------------------------------------
 __apt_get_noinput() {
-    apt-get install -y -o DPkg::Options::=--force-confold $@
+    apt-get install -y -o DPkg::Options::=--force-confold $@; return $?
+}
+
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  copyfile
+#   DESCRIPTION:  Simple function to copy files. Overrides if asked.
+#-------------------------------------------------------------------------------
+copyfile() {
+    overwrite=$FORCE_OVERWRITE
+    if [ $# -eq 2 ]; then
+        sfile=$1
+        dfile=$2
+    elif [ $# -eq 3 ]; then
+        sfile=$1
+        dfile=$2
+        overwrite=$3
+    else
+        echoerror "Wrong number of arguments for copyfile()"
+        echoinfo "USAGE: copyfile <source> <dest>  OR  copyfile <source> <dest> <overwrite>"
+        exit 1
+    fi
+
+    # Does the source file exist?
+    if [ ! -f "$sfile" ]; then
+        echowarn "$sfile does not exist!"
+        return 1
+    fi
+
+    if [ ! -f "$dfile" ]; then
+        # The destination file does not exist, copy
+        echodebug "Copying $sfile to $dfile"
+        cp "$sfile" "$dfile"
+    elif [ -f "$dfile" ] && [ $overwrite -eq $BS_TRUE ]; then
+        # The destination exist and we're overwriting
+        echodebug "Overriding $dfile with $sfile"
+        cp -f "$sfile" "$dfile"
+    elif [ -f "$dfile" ] && [ $overwrite -ne $BS_TRUE ]; then
+        echodebug "Not overriding $dfile with $sfile"
+    fi
+    return 0
 }
 
 
@@ -422,113 +811,201 @@ __apt_get_noinput() {
 #   In order to install salt for a distribution you need to define:
 #
 #   To Install Dependencies, which is required, one of:
-#       1. install_<distro>_<distro_version>_<install_type>_deps
-#       2. install_<distro>_<distro_version>_deps
-#       3. install_<distro>_<install_type>_deps
-#       4. install_<distro>_deps
+#       1. install_<distro>_<major_version>_<install_type>_deps
+#       2. install_<distro>_<major_version>_<minor_version>_<install_type>_deps
+#       3. install_<distro>_<major_version>_deps
+#       4  install_<distro>_<major_version>_<minor_version>_deps
+#       5. install_<distro>_<install_type>_deps
+#       6. install_<distro>_deps
 #
+#   Optionally, define a salt configuration function, which will be called if
+#   the -c|config-dir option is passed. One of:
+#       1. config_<distro>_<major_version>_<install_type>_salt
+#       2. config_<distro>_<major_version>_<minor_version>_<install_type>_salt
+#       3. config_<distro>_<major_version>_salt
+#       4  config_<distro>_<major_version>_<minor_version>_salt
+#       5. config_<distro>_<install_type>_salt
+#       6. config_<distro>_salt
+#       7. config_salt [THIS ONE IS ALREADY DEFINED AS THE DEFAULT]
 #
 #   To install salt, which, of course, is required, one of:
-#       1. install_<distro>_<distro_version>_<install_type>
-#       2. install_<distro>_<install_type>
+#       1. install_<distro>_<major_version>_<install_type>
+#       2. install_<distro>_<major_version>_<minor_version>_<install_type>
+#       3. install_<distro>_<install_type>
 #
-#   Optionally, define a minion configuration function, which will be called if
-#   the -c|config-dir option is passed. One of:
-#       1. config_<distro>_<distro_version>_<install_type>_minion
-#       2. config_<distro>_<distro_version>_minion
-#       3. config_<distro>_<install_type>_minion
-#       4. config_<distro>_minion
-#       5. config_minion [THIS ONE IS ALREADY DEFINED AS THE DEFAULT]
-#
-#   Also optionally, define a post install function, one of:
-#       1. install_<distro>_<distro_versions>_<install_type>_post
-#       2. install_<distro>_<distro_versions>_post
-#       3. install_<distro>_<install_type>_post
-#       4. install_<distro>_post
+#   Optionally, define a post install function, one of:
+#       1. install_<distro>_<major_version>_<install_type>_post
+#       2. install_<distro>_<major_version>_<minor_version>_<install_type>_post
+#       3. install_<distro>_<major_version>_post
+#       4  install_<distro>_<major_version>_<minor_version>_post
+#       5. install_<distro>_<install_type>_post
+#       6. install_<distro>_post
+#
+#   Optionally, define a start daemons function, one of:
+#       1. install_<distro>_<major_version>_<install_type>_restart_daemons
+#       2. install_<distro>_<major_version>_<minor_version>_<install_type>_restart_daemons
+#       3. install_<distro>_<major_version>_restart_daemons
+#       4  install_<distro>_<major_version>_<minor_version>_restart_daemons
+#       5. install_<distro>_<install_type>_restart_daemons
+#       6. install_<distro>_restart_daemons
+#
+#       NOTE: The start daemons function should be able to restart any daemons
+#             which are running, or start if they're not running.
 #
 ##############################################################################
 
+
 ##############################################################################
 #
 #   Ubuntu Install Functions
 #
 install_ubuntu_deps() {
     apt-get update
-    __apt_get_noinput python-software-properties
-    add-apt-repository -y ppa:saltstack/salt
+    if [ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
+        # Above Ubuntu 12.04 add-apt-repository is in a different package
+        __apt_get_noinput software-properties-common
+    else
+        __apt_get_noinput python-software-properties
+    fi
+    if [ $DISTRO_MAJOR_VERSION -lt 11 ] && [ $DISTRO_MINOR_VERSION -lt 10 ]; then
+        add-apt-repository ppa:saltstack/salt
+    else
+        add-apt-repository -y ppa:saltstack/salt
+    fi
     apt-get update
 }
 
-install_ubuntu_1004_deps() {
+install_ubuntu_daily_deps() {
     apt-get update
-    __apt_get_noinput python-software-properties
-    add-apt-repository ppa:saltstack/salt
+    if [ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
+        # Above Ubuntu 12.04 add-apt-repository is in a different package
+        __apt_get_noinput software-properties-common
+    else
+        __apt_get_noinput python-software-properties
+    fi
+    if [ $DISTRO_MAJOR_VERSION -lt 11 ] && [ $DISTRO_MINOR_VERSION -lt 10 ]; then
+        add-apt-repository ppa:saltstack/salt-daily
+    else
+        add-apt-repository -y ppa:saltstack/salt-daily
+    fi
     apt-get update
-    __apt_get_noinput salt-minion
-}
-
-install_ubuntu_1004_git_deps() {
-    install_ubuntu_1004_deps
-    __apt_get_noinput git-core
 }
 
-install_ubuntu_1110_deps() {
+install_ubuntu_11_10_deps() {
     apt-get update
     __apt_get_noinput python-software-properties
     add-apt-repository -y 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
     add-apt-repository -y ppa:saltstack/salt
-}
-
-install_ubuntu_daily_deps() {
-    apt-get update
-    __apt_get_noinput python-software-properties
-    add-apt-repository -y ppa:saltstack/salt-depends
-    add-apt-repository -y ppa:saltstack/salt-daily
     apt-get update
 }
 
 install_ubuntu_git_deps() {
-    apt-get update
-    __apt_get_noinput python-software-properties
-    add-apt-repository  ppa:saltstack/salt
-    apt-get update
+    install_ubuntu_deps
     __apt_get_noinput git-core python-yaml python-m2crypto python-crypto msgpack-python python-zmq python-jinja2
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
 }
 
-install_ubuntu_1110_post() {
+install_ubuntu_11_10_post() {
     add-apt-repository -y --remove 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
 }
 
 install_ubuntu_stable() {
-    __apt_get_noinput salt-minion
+    packages=""
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        packages="${packages} salt-minion"
+    fi
+    if [ $INSTALL_MASTER -eq $BS_TRUE ]; then
+        packages="${packages} salt-master"
+    fi
+    if [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        packages="${packages} salt-syndic"
+    fi
+    __apt_get_noinput ${packages}
 }
 
 install_ubuntu_daily() {
-    __apt_get_noinput salt-minion
+    install_ubuntu_stable
 }
 
 install_ubuntu_git() {
-    __git_clone_and_checkout
     python setup.py install --install-layout=deb
 }
 
 install_ubuntu_git_post() {
-    for fname in $(echo "minion master syndic"); do
-        if [ $fname != "minion" ]; then
-            # Guess we should only enable and start the minion service. Right??
-            continue
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /sbin/initctl ]; then
+            # We have upstart support
+            echodebug "There's upstart support"
+            /sbin/initctl status salt-$fname > /dev/null 2>&1
+
+            if [ $? -eq 1 ]; then
+                # upstart does not know about our service, let's copy the proper file
+                echowarn "Upstart does not apparently know anything about salt-$fname"
+                echodebug "Copying ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart to /etc/init/salt-$fname.conf"
+                copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf
+            fi
+        # No upstart support in Ubuntu!?
+        elif [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
+            echodebug "There's NO upstart support!?"
+            echodebug "Copying ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init to /etc/init.d/salt-$fname"
+            copyfile ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init /etc/init.d/salt-$fname
+            chmod +x /etc/init.d/salt-$fname
+            update-rc.d salt-$fname defaults
+        else
+            echoerror "Neither upstart not init.d was setup for salt-$fname"
         fi
-        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
-            cp ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init /etc/init.d/salt-$fname
+    done
+}
+
+install_ubuntu_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /sbin/initctl ]; then
+            echodebug "There's upstart support"
+            /sbin/initctl status salt-$fname || \
+                echowarn "Upstart does not apparently know anything about salt-$fname"
+            if [ $? -eq 0 ]; then
+                echodebug "Upstart apparently knows about salt-$fname"
+                # upstart knows about this service, let's stop and start it.
+                # We could restart but earlier versions of the upstart script
+                # did not support restart, so, it's safer this way
+                /sbin/initctl stop salt-$fname || echodebug "Failed to stop salt-$fname"
+                /sbin/initctl start salt-$fname
+                [ $? -eq 0 ] && continue
+                # We failed to start the service, let's test the SysV code bellow
+                echodebug "Failed to start salt-$fname"
+            fi
         fi
-        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.upstart ]; then
-            cp ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.upstart /etc/init/salt-$fname.conf
-        elif [ -f ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart ]; then
-            cp ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf
+
+        if [ ! -f /etc/init.d/salt-$fname ]; then
+            echoerror "No init.d support for salt-$fname was found"
+            return 1
         fi
-        chmod +x /etc/init.d/salt-$fname
-        service salt-$fname start
+
+        /etc/init.d/salt-$fname stop > /dev/null 2>&1
+        /etc/init.d/salt-$fname start
     done
+    return 0
 }
 #
 #   End of Ubuntu Install Functions
@@ -537,139 +1014,283 @@ install_ubuntu_git_post() {
 
 ##############################################################################
 #
-#   Debian Install Functions
+#   Trisquel(Ubuntu) Install Functions
 #
-
-install_debian_deps() {
+#   Trisquel 6.0 is based on Ubuntu 12.04
+#
+install_trisquel_6_stable_deps() {
     apt-get update
-}
-
-install_debian_stable() {
-    __apt_get_noinput salt-minion
-}
-
-install_debian_60_deps() {
-    echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \
-        /etc/apt/sources.list.d/backports.list
-
-    # Add madduck's repo since squeeze packages have been deprecated
-    for i in {salt-common,salt-master,salt-minion,salt-syndic,salt-doc}; do
-        echo "Package: $i"
-        echo "Pin: release a=squeeze-backports"
-        echo "Pin-Priority: 600"
-        echo
-    done > /etc/apt/preferences.d/local-salt-backport.pref
-
-    cat <<_eof > /etc/apt/sources.list.d/local-madduck-backports.list
-deb http://debian.madduck.net/repo squeeze-backports main
-deb-src http://debian.madduck.net/repo squeeze-backports main
-_eof
-
-    wget -q http://debian.madduck.net/repo/gpg/archive.key
-    apt-key add archive.key
+    __apt_get_noinput python-software-properties
+    add-apt-repository -y ppa:saltstack/salt
     apt-get update
 }
 
-install_debian_60() {
-    __apt_get_noinput salt-minion
-}
-
-install_debian_git_deps() {
+install_trisquel_6_daily_deps() {
+    apt-get update
+    __apt_get_noinput python-software-properties
+    add-apt-repository -y ppa:saltstack/salt-daily
     apt-get update
-    __apt_get_noinput lsb-release python python-pkg-resources python-crypto \
-        python-jinja2 python-m2crypto python-yaml msgpack-python git python-zmq
 }
 
-install_debian_git() {
-    __git_clone_and_checkout
-    python setup.py install --install-layout=deb
+install_trisquel_6_git_deps() {
+    install_trisquel_6_stable_deps
+    __apt_get_noinput git-core python-yaml python-m2crypto python-crypto \
+        msgpack-python python-zmq python-jinja2
 
-    # Let's trigger config_minion()
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
     if [ "$TEMP_CONFIG_DIR" = "null" ]; then
         TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
-        CONFIG_MINION_FUNC="config_minion"
+        CONFIG_SALT_FUNC="config_salt"
     fi
-}
 
-install_debian_60_git_deps() {
-    install_debian_60_deps # Add backports
-    install_debian_git_deps # Grab the actual deps
+    return 0
 }
 
-install_debian_60_git() {
-    apt-get -y purge salt-minion
+install_trisquel_6_stable() {
+    install_ubuntu_stable
+}
 
-    __git_clone_and_checkout
+install_trisquel_6_daily() {
+    install_ubuntu_daily
+}
 
-    python setup.py install --install-layout=deb
+install_trisquel_6_git() {
+    install_ubuntu_git
+}
 
-    # Let's trigger config_minion()
-    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
-        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
-        CONFIG_MINION_FUNC="config_minion"
-    fi
+install_trisquel_git_post() {
+    install_ubuntu_git_post
 }
 
-install_debian_git_post() {
-    for fname in $(echo "minion master syndic"); do
-        if [ $fname != "minion" ]; then
-            # Guess we should only enable and start the minion service. Right??
-            continue
-        fi
-        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
-            cp ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init /etc/init.d/salt-$fname
-        fi
-        chmod +x /etc/init.d/salt-$fname
-        /etc/init.d/salt-$fname start
-    done
+install_trisquel_restart_daemons() {
+    install_ubuntu_restart_daemons
 }
 #
-#   Ended Debian Install Functions
+#   End of Tristel(Ubuntu) Install Functions
 #
 ##############################################################################
 
 ##############################################################################
 #
-#   Fedora Install Functions
+#   Debian Install Functions
 #
-install_fedora_deps() {
-    yum install -y PyYAML libyaml m2crypto python-crypto python-jinja2 python-msgpack python-zmq
+install_debian_deps() {
+    apt-get update
 }
 
-install_fedora_stable() {
-    yum install -y salt-minion
-}
+install_debian_6_0_deps() {
+    [ $PIP_ALLOWED -eq $BS_FALSE ] && pip_not_allowed
+    echowarn "PyZMQ will be installed from PyPi in order to compile it against ZMQ3"
+    echowarn "This is required for long term stable minion connections to the master."
 
+    # No user interaction, libc6 restart services for example
+    export DEBIAN_FRONTEND=noninteractive
 
-install_fedora_git_deps() {
-    install_fedora_deps
-    yum install -y git
-}
+    if [ "x$(grep -R 'backports.debian.org' /etc/apt)" = "x" ]; then
+        echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \
+            /etc/apt/sources.list.d/backports.list
+    fi
 
-install_fedora_git() {
-    __git_clone_and_checkout
-    python setup.py install
-}
+    if [ ! -f /etc/apt/preferences.d/local-salt-backport.pref ]; then
+        # Add madduck's repo since squeeze packages have been deprecated
+        for fname in salt-common salt-master salt-minion salt-syndic salt-doc; do
+            echo "Package: $fname"
+            echo "Pin: release a=squeeze-backports"
+            echo "Pin-Priority: 600"
+            echo
+        done > /etc/apt/preferences.d/local-salt-backport.pref
 
-install_fedora_git_post() {
-    for fname in $(echo "minion master syndic"); do
-        if [ $fname != "minion" ]; then
-            # Guess we should only enable and start the minion service. Right??
-            continue
+        cat <<_eof > /etc/apt/sources.list.d/local-madduck-backports.list
+deb http://debian.madduck.net/repo squeeze-backports main
+deb-src http://debian.madduck.net/repo squeeze-backports main
+_eof
+
+        wget -q http://debian.madduck.net/repo/gpg/archive.key -O - | apt-key add -
+    fi
+
+    if [ ! -f /etc/apt/sources.list.d/debian-experimental.list ]; then
+        cat <<_eof > /etc/apt/sources.list.d/debian-experimental.list
+deb http://ftp.debian.org/debian experimental main
+deb-src http://ftp.debian.org/debian experimental main
+_eof
+
+        cat <<_eof > /etc/apt/preferences.d/libzmq3-debian-experimental.pref
+Package: libzmq3
+Pin: release a=experimental
+Pin-Priority: 800
+
+Package: libzmq3-dev
+Pin: release a=experimental
+Pin-Priority: 800
+_eof
+    fi
+
+    apt-get update
+    __apt_get_noinput -t experimental libzmq3 libzmq3-dev
+    __apt_get_noinput build-essential python-dev python-pip
+}
+
+install_debian_git_deps() {
+    [ $PIP_ALLOWED -eq $BS_FALSE ] && pip_not_allowed
+    echowarn "PyZMQ will be installed from PyPi in order to compile it against ZMQ3"
+    echowarn "This is required for long term stable minion connections to the master."
+
+    # No user interaction, libc6 restart services for example
+    export DEBIAN_FRONTEND=noninteractive
+
+    apt-get update
+    __apt_get_noinput lsb-release python python-pkg-resources python-crypto \
+        python-jinja2 python-m2crypto python-yaml msgpack-python python-pip git
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_debian_6_0_git_deps() {
+    install_debian_6_0_deps  # Add backports
+    install_debian_git_deps  # Grab the actual deps
+}
+
+install_debian_stable() {
+    packages=""
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        packages="${packages} salt-minion"
+    fi
+    if [ $INSTALL_MASTER -eq $BS_TRUE ]; then
+        packages="${packages} salt-master"
+    fi
+    if [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        packages="${packages} salt-syndic"
+    fi
+    __apt_get_noinput ${packages}
+
+    # Building pyzmq from source to build it against libzmq3.
+    # Should override current installation
+    pip install -U pyzmq
+}
+
+
+install_debian_6_0() {
+    install_debian_stable
+}
+
+install_debian_git() {
+    python setup.py install --install-layout=deb
+
+    # Building pyzmq from source to build it against libzmq3.
+    # Should override current installation
+    pip install -U pyzmq
+}
+
+install_debian_6_0_git() {
+    install_debian_git
+}
+
+install_debian_git_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
+            copyfile ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init /etc/init.d/salt-$fname
         fi
-        #cp ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname /etc/rc.d/init.d/salt-$fname
-        cp ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname.service /lib/systemd/system/salt-$fname.service
-        #chmod +x /etc/rc.d/init.d/salt-$fname
-
-        # Switch from forking to simple, dunny why I can't make it work
-        sed -i 's/Type=forking/Type=simple/g' /lib/systemd/system/salt-$fname.service
-        # Remove the daemon flag because of the above
-        sed -ie 's;ExecStart=\(.*\) -d;ExecStart=\1;' /lib/systemd/system/salt-$fname.service
-        systemctl preset salt-$fname.service
-        systemctl enable salt-$fname.service
-        sleep 0.2
+        chmod +x /etc/init.d/salt-$fname
+        update-rc.d salt-$fname defaults
+    done
+}
+
+install_debian_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        /etc/init.d/salt-$fname stop > /dev/null 2>&1
+        /etc/init.d/salt-$fname start
+    done
+}
+#
+#   Ended Debian Install Functions
+#
+##############################################################################
+
+##############################################################################
+#
+#   Fedora Install Functions
+#
+install_fedora_deps() {
+    yum install -y PyYAML libyaml m2crypto python-crypto python-jinja2 python-msgpack python-zmq
+}
+
+install_fedora_stable() {
+    packages=""
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        packages="${packages} salt-minion"
+    fi
+    if [ $INSTALL_MASTER -eq $BS_TRUE ] || [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        packages="${packages} salt-master"
+    fi
+    yum install -y ${packages}
+}
+
+install_fedora_git_deps() {
+    install_fedora_deps
+    yum install -y git
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_fedora_git() {
+    python setup.py install
+}
+
+install_fedora_git_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname.service /lib/systemd/system/salt-$fname.service
+
+        systemctl is-enabled salt-$fname.service || (systemctl preset salt-$fname.service && systemctl enable salt-$fname.service)
+        sleep 0.1
         systemctl daemon-reload
-        sleep 0.2
+    done
+}
+
+install_fedora_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        systemctl stop salt-$fname > /dev/null 2>&1
         systemctl start salt-$fname.service
     done
 }
@@ -682,85 +1303,391 @@ install_fedora_git_post() {
 #
 #   CentOS Install Functions
 #
-install_centos_63_stable_deps() {
+install_centos_stable_deps() {
     if [ $CPU_ARCH_L = "i686" ]; then
-        local ARCH="i386"
+        EPEL_ARCH="i386"
+    else
+        EPEL_ARCH=$CPU_ARCH_L
+    fi
+    if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
+        rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/5/${EPEL_ARCH}/epel-release-5-4.noarch.rpm
+    elif [ $DISTRO_MAJOR_VERSION -eq 6 ]; then
+        rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm
     else
-        local ARCH=$CPU_ARCH_L
+        echoerror "Failed add EPEL repository support."
+        exit 1
     fi
-    rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/${ARCH}/epel-release-6-8.noarch.rpm
+
     yum -y update
+
+    if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
+        yum -y install PyYAML python26-m2crypto m2crypto python26 python26-crypto \
+            python26-msgpack python26-zmq python26-jinja2 --enablerepo=epel-testing
+    else
+        yum -y install PyYAML m2crypto python-crypto python-msgpack python-zmq \
+            python-jinja2 --enablerepo=epel-testing
+    fi
 }
 
-install_centos_63_stable() {
-    yum -y install salt-minion --enablerepo=epel-testing
+install_centos_stable() {
+    packages=""
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        packages="${packages} salt-minion"
+    fi
+    if [ $INSTALL_MASTER -eq $BS_TRUE ] || [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        packages="${packages} salt-master"
+    fi
+    yum -y install ${packages} --enablerepo=epel-testing
 }
 
-install_centos_63_stable_post() {
-    /sbin/chkconfig salt-minion on
-    /etc/init.d/salt-minion start
+install_centos_stable_post() {
+    for fname in minion master syndic; do
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ ! -f /sbin/initctl ] && [ -f /etc/init.d/salt-$fname ]; then
+            # Still in SysV init!?
+            /sbin/chkconfig salt-$fname on
+        fi
+    done
 }
 
-install_centos_63_git_deps() {
-    install_centos_63_stable_deps
-    yum -y install git PyYAML m2crypto python-crypto python-msgpack python-zmq python-jinja2 --enablerepo=epel-testing
+install_centos_git_deps() {
+    install_centos_stable_deps
+    yum -y install git --enablerepo=epel-testing
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
 }
 
-install_centos_63_git() {
-    rm -rf /usr/lib/python*/site-packages/salt
-    rm -rf /usr/bin/salt*
+install_centos_git() {
+    if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
+        python2.6 setup.py install
+    else
+        python2 setup.py install
+    fi
+}
 
-    __git_clone_and_checkout
-    python2 setup.py install
-    mkdir -p /etc/salt/
+install_centos_git_post() {
+    for fname in master minion syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /sbin/initctl ]; then
+            # We have upstart support
+            /sbin/initctl status salt-$fname > /dev/null 2>&1
+            if [ $? -eq 1 ]; then
+                # upstart does not know about our service, let's copy the proper file
+                copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf
+            fi
+        # Still in SysV init?!
+        elif [ ! -f /etc/init.d/salt-$fname ]; then
+            copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname} /etc/init.d/
+            chmod +x /etc/init.d/salt-${fname}
+            /sbin/chkconfig salt-${fname} on
+        fi
+    done
 }
 
-install_centos_63_git_post() {
-    cp pkg/rpm/salt-{master,minion} /etc/init.d/
-    chmod +x /etc/init.d/salt-{master,minion}
-    /sbin/chkconfig salt-minion on
-    /etc/init.d/salt-minion start
+install_centos_restart_daemons() {
+    for fname in minion master syndic; do
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /sbin/initctl ]; then
+            # We have upstart support
+            /sbin/initctl status salt-$fname > /dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                # upstart knows about this service.
+                # Let's try to stop it, and then start it
+                /sbin/initctl stop salt-$fname > /dev/null 2>&1
+                /sbin/initctl start salt-$fname > /dev/null 2>&1
+                # Restart service
+                [ $? -eq 0 ] && continue
+                # We failed to start the service, let's test the SysV code bellow
+            fi
+        fi
+
+        if [ -f /etc/init.d/salt-$fname ]; then
+            # Still in SysV init!?
+            /etc/init.d/salt-$fname stop > /dev/null 2>&1
+            /etc/init.d/salt-$fname start
+        fi
+    done
 }
 #
 #   Ended CentOS Install Functions
 #
 ##############################################################################
 
+##############################################################################
+#
+#   RedHat Install Functions
+#
+install_red_hat_linux_stable_deps() {
+    install_centos_stable_deps
+}
+
+install_red_hat_linux_git_deps() {
+    install_centos_git_deps
+}
+
+install_red_hat_enterprise_linux_stable_deps() {
+    install_red_hat_linux_stable_deps
+}
+
+install_red_hat_enterprise_linux_git_deps() {
+    install_red_hat_linux_git_deps
+}
+
+install_red_hat_enterprise_server_stable_deps() {
+    install_red_hat_linux_stable_deps
+}
+
+install_red_hat_enterprise_server_git_deps() {
+    install_red_hat_linux_git_deps
+}
+
+install_red_hat_linux_stable() {
+    install_centos_stable
+}
+
+install_red_hat_linux_git() {
+    install_centos_git
+}
+
+install_red_hat_enterprise_linux_stable() {
+    install_red_hat_linux_stable
+}
+
+install_red_hat_enterprise_linux_git() {
+    install_red_hat_linux_git
+}
+
+install_red_hat_enterprise_server_stable() {
+    install_red_hat_linux_stable
+}
+
+install_red_hat_enterprise_server_git() {
+    install_red_hat_linux_git
+}
+
+install_red_hat_linux_stable_post() {
+    install_centos_stable_post
+}
+
+install_red_hat_linux_restart_daemons() {
+    install_centos_restart_daemons
+}
+
+install_red_hat_linux_git_post() {
+    install_centos_git_post
+}
+
+install_red_hat_enterprise_linux_stable_post() {
+    install_red_hat_linux_stable_post
+}
+
+install_red_hat_enterprise_linux_restart_daemons() {
+    install_red_hat_linux_restart_daemons
+}
+
+install_red_hat_enterprise_linux_git_post() {
+    install_red_hat_linux_git_post
+}
+
+install_red_hat_enterprise_server_stable_post() {
+    install_red_hat_linux_stable_post
+}
+
+install_red_hat_enterprise_server_restart_daemons() {
+    install_red_hat_linux_restart_daemons
+}
+
+install_red_hat_enterprise_server_git_post() {
+    install_red_hat_linux_git_post
+}
+#
+#   Ended RedHat Install Functions
+#
+##############################################################################
+
+##############################################################################
+#
+#   Amazon Linux AMI Install Functions
+#
+install_amazon_linux_ami_deps() {
+    # Acording to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
+    # enable the EPEL 6 repo
+    if [ $CPU_ARCH_L = "i686" ]; then
+        EPEL_ARCH="i386"
+    else
+        EPEL_ARCH=$CPU_ARCH_L
+    fi
+    rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm
+    yum -y update
+    yum -y install PyYAML m2crypto python-crypto python-msgpack python-zmq \
+        python-ordereddict python-jinja2 --enablerepo=epel-testing
+}
+
+install_amazon_linux_ami_git_deps() {
+    install_amazon_linux_ami_deps
+    yum -y install git --enablerepo=epel-testing
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_amazon_linux_ami_stable() {
+    install_centos_stable
+}
+
+install_amazon_linux_ami_stable_post() {
+    install_centos_stable_post
+}
+
+install_amazon_linux_ami_restart_daemons() {
+    install_centos_restart_daemons
+}
+
+install_amazon_linux_ami_git() {
+    install_centos_git
+}
+
+install_amazon_linux_ami_git_post() {
+    install_centos_git_post
+}
+#
+#   Ended Amazon Linux AMI Install Functions
+#
+##############################################################################
 
 ##############################################################################
 #
 #   Arch Install Functions
 #
-install_arch_stable_deps() {
-    echo '[salt]
+install_arch_linux_stable_deps() {
+    grep '\[salt\]' /etc/pacman.conf >/dev/null 2>&1 || echo '[salt]
 Server = http://intothesaltmine.org/archlinux
 ' >> /etc/pacman.conf
 }
 
-install_arch_git_deps() {
-    echo '[salt]
-    Server = http://intothesaltmine.org/archlinux
-    ' >> /etc/pacman.conf
+install_arch_linux_git_deps() {
+    grep '\[salt\]' /etc/pacman.conf >/dev/null 2>&1 || echo '[salt]
+Server = http://intothesaltmine.org/archlinux
+' >> /etc/pacman.conf
+
+    pacman -Sy --noconfirm pacman
+    pacman -Sy --noconfirm git python2-crypto python2-distribute \
+        python2-jinja python2-m2crypto python2-markupsafe python2-msgpack \
+        python2-psutil python2-yaml python2-pyzmq zeromq
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
 }
 
-install_arch_stable() {
+install_arch_linux_stable() {
     pacman -Sy --noconfirm pacman
     pacman -Syu --noconfirm salt
 }
 
-install_arch_git() {
-    pacman -Sy --noconfirm pacman
-    pacman -Syu --noconfirm salt git
-    rm -rf /usr/lib/python2.7/site-packages/salt*
-    rm -rf /usr/bin/salt-*
+install_arch_linux_git() {
+    python2 setup.py install
+}
 
-    __git_clone_and_checkout
+install_arch_linux_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /usr/bin/systemctl ]; then
+            # Using systemd
+            /usr/bin/systemctl is-enabled salt-$fname.service > /dev/null 2>&1 || (
+                /usr/bin/systemctl preset salt-$fname.service > /dev/null 2>&1 &&
+                /usr/bin/systemctl enable salt-$fname.service > /dev/null 2>&1
+            )
+            sleep 0.1
+            /usr/bin/systemctl daemon-reload
+            continue
+        fi
 
-    python2 setup.py install
+        # XXX: How do we enable old Arch init.d scripts?
+    done
+}
+
+install_arch_linux_git_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /usr/bin/systemctl ]; then
+            copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname.service /lib/systemd/system/salt-$fname.service
+
+            /usr/bin/systemctl is-enabled salt-$fname.service > /dev/null 2>&1 || (
+                /usr/bin/systemctl preset salt-$fname.service > /dev/null 2>&1 &&
+                /usr/bin/systemctl enable salt-$fname.service > /dev/null 2>&1
+            )
+            sleep 0.1
+            /usr/bin/systemctl daemon-reload
+            continue
+        fi
+
+        # SysV init!?
+        copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname /etc/rc.d/init.d/salt-$fname
+        chmod +x /etc/rc.d/init.d/salt-$fname
+    done
 }
 
-install_arch_post() {
-    /etc/rc.d/salt-minion start
+install_arch_linux_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /usr/bin/systemctl ]; then
+            /usr/bin/systemctl stop salt-$fname.service > /dev/null 2>&1
+            /usr/bin/systemctl start salt-$fname.service
+            continue
+        fi
+        /etc/rc.d/salt-$fname stop > /dev/null 2>&1
+        /etc/rc.d/salt-$fname start
+    done
 }
 #
 #   Ended Arch Install Functions
@@ -771,101 +1698,483 @@ install_arch_post() {
 #
 #   FreeBSD Install Functions
 #
-install_freebsd_90_stable_deps() {
+__freebsd_get_packagesite() {
     if [ $CPU_ARCH_L = "amd64" ]; then
-        local ARCH="x86:64"
+        BSD_ARCH="x86:64"
     elif [ $CPU_ARCH_L = "x86_64" ]; then
-        local ARCH="x86:64"
+        BSD_ARCH="x86:64"
     elif [ $CPU_ARCH_L = "i386" ]; then
-        local ARCH="x86:32"
+        BSD_ARCH="x86:32"
     elif [ $CPU_ARCH_L = "i686" ]; then
-        local ARCH="x86:32"
+        BSD_ARCH="x86:32"
     fi
 
-    fetch http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest/Latest/pkg.txz
+    if [ "x${PACKAGESITE}" = "x" ]; then
+        echowarn "The environment variable PACKAGESITE is not set."
+        echowarn "The installation will, most likely fail since pkgbeta.freebsd.org does not yet contain any packages"
+    fi
+    BS_PACKAGESITE=${PACKAGESITE:-"http://pkgbeta.freebsd.org/freebsd:${DISTRO_MAJOR_VERSION}:${BSD_ARCH}/latest"}
+}
+
+install_freebsd_9_stable_deps() {
+    __freebsd_get_packagesite
+
+    fetch "${BS_PACKAGESITE}/Latest/pkg.txz"
     tar xf ./pkg.txz -s ",/.*/,,g" "*/pkg-static"
     ./pkg-static add ./pkg.txz
     /usr/local/sbin/pkg2ng
-    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest" > /usr/local/etc/pkg.conf
+    echo "PACKAGESITE: ${BS_PACKAGESITE}" > /usr/local/etc/pkg.conf
 
     /usr/local/sbin/pkg install -y swig
 }
 
 install_freebsd_git_deps() {
-    if [ $CPU_ARCH_L = "amd64" ]; then
-        local ARCH="x86:64"
-    elif [ $CPU_ARCH_L = "x86_64" ]; then
-        local ARCH="x86:64"
-    elif [ $CPU_ARCH_L = "i386" ]; then
-        local ARCH="x86:32"
-    elif [ $CPU_ARCH_L = "i686" ]; then
-        local ARCH="x86:32"
-    fi
+    __freebsd_get_packagesite
 
-    fetch http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest/Latest/pkg.txz
+    fetch "${BS_PACKAGESITE}/Latest/pkg.txz"
     tar xf ./pkg.txz -s ",/.*/,,g" "*/pkg-static"
     ./pkg-static add ./pkg.txz
     /usr/local/sbin/pkg2ng
-    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest" > /usr/local/etc/pkg.conf
+    echo "PACKAGESITE: ${BS_PACKAGESITE}" > /usr/local/etc/pkg.conf
 
     /usr/local/sbin/pkg install -y swig
+
+    __git_clone_and_checkout || return 1
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
 }
 
-install_freebsd_90_stable() {
-    /usr/local/sbin/pkg install -y salt
+install_freebsd_9_stable() {
+    /usr/local/sbin/pkg install -y sysutils/py-salt
 }
 
 install_freebsd_git() {
-    /usr/local/sbin/pkg install -y git salt
-    /usr/local/sbin/pkg delete -y salt
-
-    __git_clone_and_checkout
+    /usr/local/sbin/pkg install -y git sysutils/py-salt
+    /usr/local/sbin/pkg delete -y sysutils/py-salt
 
     /usr/local/bin/python setup.py install
 }
 
-install_freebsd_90_stable_post() {
-    salt-minion -d
+install_freebsd_9_stable_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        enable_string="salt_${fname}_enable=\"YES\""
+        grep "$enable_string" /etc/rc.conf >/dev/null 2>&1
+        [ $? -eq 1 ] && echo "$enable_string" >> /etc/rc.conf
+
+        [ -f /usr/local/etc/salt/${fname}.sample ] && copyfile /usr/local/etc/salt/${fname}.sample /usr/local/etc/salt/${fname}
+
+        if [ $fname = "minion" ] ; then
+            grep "salt_minion_paths" /etc/rc.conf >/dev/null 2>&1
+            [ $? -eq 1 ] && echo "salt_minion_paths=\"/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin\"" >> /etc/rc.conf
+        fi
+
+    done
 }
 
 install_freebsd_git_post() {
-    salt-minion -d
+    install_freebsd_9_stable_post
+}
+
+install_freebsd_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        service salt_$fname stop > /dev/null 2>&1
+        service salt_$fname start
+    done
 }
 #
 #   Ended FreeBSD Install Functions
 #
 ##############################################################################
 
+##############################################################################
+#
+#   SmartOS Install Functions
+#
+install_smartos_deps() {
+    [ $PIP_ALLOWED -eq $BS_FALSE ] && pip_not_allowed
+    echowarn "PyZMQ will be installed using pip"
+
+    ZEROMQ_VERSION='3.2.2'
+    pkgin -y in libtool-base autoconf automake libuuid gcc-compiler gmake \
+        python27 py27-pip py27-setuptools py27-yaml py27-crypto swig
+    [ -d zeromq-${ZEROMQ_VERSION} ] || (
+        wget http://download.zeromq.org/zeromq-${ZEROMQ_VERSION}.tar.gz &&
+        tar -xvf zeromq-${ZEROMQ_VERSION}.tar.gz
+    )
+    cd zeromq-${ZEROMQ_VERSION}
+    ./configure
+    make
+    make install
+
+    pip-2.7 install pyzmq
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        # Let's set the configuration directory to /tmp
+        TEMP_CONFIG_DIR="/tmp"
+        CONFIG_SALT_FUNC="config_salt"
+
+        # Let's download, since they were not provided, the default configuration files
+        if [ ! -f /etc/salt/minion ] && [ ! -f $TEMP_CONFIG_DIR/minion ]; then
+            curl -sk -o $TEMP_CONFIG_DIR/minion -L https://raw.github.com/saltstack/salt/blob/develop/conf/minion
+        fi
+        if [ ! -f /etc/salt/master ] && [ ! -f $TEMP_CONFIG_DIR/master ]; then
+            curl -sk -o $TEMP_CONFIG_DIR/master -L https://raw.github.com/saltstack/salt/blob/develop/conf/master
+        fi
+    fi
+
+}
+
+install_smartos_git_deps() {
+    install_smartos_deps
+    pkgin -y in scmgit
+
+    __git_clone_and_checkout || return 1
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_smartos_stable() {
+    USE_SETUPTOOLS=1 pip-2.7 install salt
+}
+
+install_smartos_git() {
+    # Use setuptools in order to also install dependencies
+    USE_SETUPTOOLS=1 /opt/local/bin/python setup.py install
+}
+
+install_smartos_post() {
+    # Install manifest files if needed.
+    for fname in minion master syndic; do
+        svcs network/salt-$fname > /dev/null 2>&1
+        if [ $? -eq 1 ]; then
+            if [ ! -f $TEMP_CONFIG_DIR/salt-$fname.xml ]; then
+                curl -sk -o $TEMP_CONFIG_DIR/salt-$fname.xml -L https://raw.github.com/saltstack/salt/develop/pkg/solaris/salt-$fname.xml
+            fi
+            svccfg import $TEMP_CONFIG_DIR/salt-$fname.xml
+        fi
+    done
+}
+
+install_smartos_git_post() {
+    # Install manifest files if needed.
+    for fname in minion master syndic; do
+        svcs network/salt-$fname > /dev/null 2>&1
+        if [ $? -eq 1 ]; then
+            svccfg import ${SALT_GIT_CHECKOUT_DIR}/pkg/solaris/salt-$fname.xml
+        fi
+    done
+}
+
+install_smartos_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        # Stop if running && Start service
+        svcadm disable salt-$fname > /dev/null 2>&1
+        svcadm enable salt-$fname
+    done
+}
+#
+#   Ended SmartOS Install Functions
+#
+##############################################################################
+
+##############################################################################
+#
+#    openSUSE Install Functions.
+#
+install_opensuse_stable_deps() {
+    DISTRO_REPO="openSUSE_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
+    zypper --non-interactive addrepo --refresh \
+        http://download.opensuse.org/repositories/devel:/languages:/python/${DISTRO_REPO}/devel:languages:python.repo
+    zypper --gpg-auto-import-keys --non-interactive refresh
+    zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
+        python-Jinja2 python-M2Crypto python-PyYAML python-msgpack-python \
+        python-pycrypto python-pyzmq
+}
+
+install_opensuse_git_deps() {
+    install_opensuse_stable_deps
+    zypper --non-interactive install --auto-agree-with-licenses git
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_opensuse_stable() {
+    packages=""
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        packages="${packages} salt-minion"
+    fi
+    if [ $INSTALL_MASTER -eq $BS_TRUE ]; then
+        packages="${packages} salt-master"
+    fi
+    if [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        packages="${packages} salt-syndic"
+    fi
+    zypper --non-interactive install --auto-agree-with-licenses $packages
+}
+
+install_opensuse_git() {
+    python setup.py install --prefix=/usr
+}
+
+install_opensuse_stable_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /bin/systemctl ]; then
+            systemctl is-enabled salt-$fname.service || (systemctl preset salt-$fname.service && systemctl enable salt-$fname.service)
+            sleep 0.1
+            systemctl daemon-reload
+            continue
+        fi
+
+        /sbin/chkconfig --add salt-$fname
+        /sbin/chkconfig salt-$fname on
+
+    done
+}
+
+install_opensuse_git_post() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /bin/systemctl ]; then
+            copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.service /lib/systemd/system/salt-$fname.service
+            continue
+        fi
+
+        copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname /etc/init.d/salt-$fname
+        chmod +x /etc/init.d/salt-$fname
+
+    done
+
+    install_opensuse_stable_post
+}
+
+install_opensuse_restart_daemons() {
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ -f /bin/systemctl ]; then
+            systemctl stop salt-$fname > /dev/null 2>&1
+            systemctl start salt-$fname.service
+            continue
+        fi
+
+        service salt-$fname stop > /dev/null 2>&1
+        service salt-$fname start
+
+    done
+}
+#
+#   End of openSUSE Install Functions.
+#
+##############################################################################
+
+##############################################################################
+#
+#    SuSE Install Functions.
+#
+install_suse_11_stable_deps() {
+    SUSE_PATCHLEVEL=$(grep PATCHLEVEL /etc/SuSE-release | awk '{print $3}')
+    if [ "x${SUSE_PATCHLEVEL}" != "x" ]; then
+        DISTRO_PATCHLEVEL="_SP${SUSE_PATCHLEVEL}"
+    fi
+    DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}${DISTRO_PATCHLEVEL}"
+
+    zypper --non-interactive addrepo --refresh \
+        http://download.opensuse.org/repositories/devel:/languages:/python/${DISTRO_REPO}/devel:languages:python.repo
+    zypper --gpg-auto-import-keys --non-interactive refresh
+    if [ $SUSE_PATCHLEVEL -eq 1 ]; then
+        [ $PIP_ALLOWED -eq $BS_FALSE ] && pip_not_allowed
+        echowarn "PyYaml will be installed using pip"
+        zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
+        python-Jinja2 'python-M2Crypto>=0.21' python-msgpack-python \
+        python-pycrypto python-pyzmq python-pip
+        # There's no python-PyYaml in SP1, let's install it using pip
+        pip install PyYaml
+    else
+        zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
+        python-Jinja2 'python-M2Crypto>=0.21' python-PyYAML python-msgpack-python \
+        python-pycrypto python-pyzmq
+    fi
+}
+
+install_suse_11_git_deps() {
+    install_suse_11_stable_deps
+    zypper --non-interactive install --auto-agree-with-licenses git
+
+    __git_clone_and_checkout || return 1
+
+    # Let's trigger config_salt()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_SALT_FUNC="config_salt"
+    fi
+
+    return 0
+}
+
+install_suse_11_stable() {
+    if [ $SUSE_PATCHLEVEL -gt 1 ]; then
+        install_opensuse_stable
+    else
+        # USE_SETUPTOOLS=1 To work around
+        # error: option --single-version-externally-managed not recognized
+        USE_SETUPTOOLS=1 pip install salt
+    fi
+}
+
+install_suse_11_git() {
+    install_opensuse_git
+}
+
+install_suse_11_stable_post() {
+    if [ $SUSE_PATCHLEVEL -gt 1 ]; then
+        install_opensuse_stable_post
+    else
+        for fname in minion master syndic; do
+
+            # Skip if not meant to be installed
+            [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+            [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+            [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+            if [ -f /bin/systemctl ]; then
+                curl -k -L https://github.com/saltstack/salt/raw/develop/pkg/salt-$fname.service \
+                    -o /lib/systemd/system/salt-$fname.service
+                continue
+            fi
+
+            curl -k -L https://github.com/saltstack/salt/raw/develop/pkg/rpm/salt-$fname \
+                -o /etc/init.d/salt-$fname
+            chmod +x /etc/init.d/salt-$fname
+
+        done
+    fi
+}
+
+install_suse_11_git_post() {
+    install_opensuse_git_post
+}
+
+install_suse_11_restart_daemons() {
+    install_opensuse_restart_daemons
+}
+#
+#   End of SuSE Install Functions.
+#
+##############################################################################
 
 ##############################################################################
 #
 #   Default minion configuration function. Matches ANY distribution as long as
-# the -c options is passed.
+#   the -c options is passed.
 #
-config_minion() {
+config_salt() {
     # If the configuration directory is not passed, return
     [ "$TEMP_CONFIG_DIR" = "null" ] && return
-    # If the configuration directory does not exist, error out
-    if [ ! -d "$TEMP_CONFIG_DIR" ]; then
-        echo " * The configuration directory ${TEMP_CONFIG_DIR} does not exist."
-        exit 1
-    fi
+
+    CONFIGURED_ANYTHING=$BS_FALSE
+
+    PKI_DIR=$SALT_ETC_DIR/pki
 
     # Let's create the necessary directories
-    [ -d /etc/salt ] || mkdir /etc/salt
-    [ -d /etc/salt/pki ] || mkdir /etc/salt/pki && chmod 700 /etc/salt/pki
+    [ -d $SALT_ETC_DIR ] || mkdir $SALT_ETC_DIR
+    [ -d $PKI_DIR ] || mkdir -p $PKI_DIR && chmod 700 $PKI_DIR
+
+    if [ $INSTALL_MINION -eq $BS_TRUE ]; then
+        # Create the PKI directory
+        [ -d $PKI_DIR/minion ] || mkdir -p $PKI_DIR/minion && chmod 700 $PKI_DIR/minion
+
+        # Copy the minions configuration if found
+        [ -f "$TEMP_CONFIG_DIR/minion" ] && mv "$TEMP_CONFIG_DIR/minion" /etc/salt && CONFIGURED_ANYTHING=$BS_TRUE
+
+        # Copy the minion's keys if found
+        if [ -f "$TEMP_CONFIG_DIR/minion.pem" ]; then
+            mv "$TEMP_CONFIG_DIR/minion.pem" $PKI_DIR/minion/
+            chmod 400 $PKI_DIR/minion/minion.pem
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
+        if [ -f "$TEMP_CONFIG_DIR/minion.pub" ]; then
+            mv "$TEMP_CONFIG_DIR/minion.pub" $PKI_DIR/minion/
+            chmod 664 $PKI_DIR/minion/minion.pub
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
+    fi
 
-    # Copy the minions configuration if found
-    [ -f "$TEMP_CONFIG_DIR/minion" ] && mv "$TEMP_CONFIG_DIR/minion" /etc/salt
 
-    # Copy the minion's keys if found
-    if [ -f "$TEMP_CONFIG_DIR/minion.pem" ]; then
-        mv "$TEMP_CONFIG_DIR/minion.pem" /etc/salt/pki
-        chmod 400 /etc/salt/pki/minion.pem
+    if [ $INSTALL_MASTER -eq $BS_TRUE ] || [ $INSTALL_SYNDIC -eq $BS_TRUE ]; then
+        # Create the PKI directory
+        [ -d $PKI_DIR/master ] || mkdir -p $PKI_DIR/master && chmod 700 $PKI_DIR/master
+
+        # Copy the masters configuration if found
+        [ -f "$TEMP_CONFIG_DIR/master" ] && mv "$TEMP_CONFIG_DIR/master" /etc/salt && CONFIGURED_ANYTHING=$BS_TRUE
+
+        # Copy the master's keys if found
+        if [ -f "$TEMP_CONFIG_DIR/master.pem" ]; then
+            mv "$TEMP_CONFIG_DIR/master.pem" $PKI_DIR/master/
+            chmod 400 $PKI_DIR/master/master.pem
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
+        if [ -f "$TEMP_CONFIG_DIR/master.pub" ]; then
+            mv "$TEMP_CONFIG_DIR/master.pub" $PKI_DIR/master/
+            chmod 664 $PKI_DIR/master/master.pub
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
     fi
-    if [ -f "$TEMP_CONFIG_DIR/minion.pub" ]; then
-        mv "$TEMP_CONFIG_DIR/minion.pub" /etc/salt/pki
-        chmod 664 /etc/salt/pki/minion.pub
+
+    if [ $CONFIG_ONLY -eq $BS_TRUE ] && [ $CONFIGURED_ANYTHING -eq $BS_FALSE ]; then
+        echowarn "No configuration or keys were copied over. No configuration was done!"
+        exit 0
     fi
 }
 #
@@ -874,18 +2183,45 @@ config_minion() {
 ##############################################################################
 
 
+##############################################################################
+#
+#   This function checks if all of the installed daemons are running or not.
+#
+daemons_running() {
+    FAILED_DAEMONS=0
+    for fname in minion master syndic; do
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+        [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+        if [ "x$(ps aux | grep -v grep | grep salt-$fname)" = "x" ]; then
+            echoerror "salt-$fname was not found running"
+            FAILED_DAEMONS=$(expr $FAILED_DAEMONS + 1)
+        fi
+    done
+    return $FAILED_DAEMONS
+}
+#
+#  Ended daemons running check function
+#
+##############################################################################
+
 
 #=============================================================================
 # LET'S PROCEED WITH OUR INSTALLATION
 #=============================================================================
 # Let's get the dependencies install function
-DEP_FUNC_NAMES="install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}_deps"
-DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_deps"
+DEP_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_deps"
+DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}_deps"
+DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_deps"
+DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_deps"
 DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}_deps"
 DEP_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}_deps"
 
 DEPS_INSTALL_FUNC="null"
-for DEP_FUNC_NAME in $DEP_FUNC_NAMES; do
+for DEP_FUNC_NAME in $(__strip_duplicates $DEP_FUNC_NAMES); do
     if __function_defined $DEP_FUNC_NAME; then
         DEPS_INSTALL_FUNC=$DEP_FUNC_NAME
         break
@@ -893,12 +2229,34 @@ for DEP_FUNC_NAME in $DEP_FUNC_NAMES; do
 done
 
 
+# Let's get the minion config function
+CONFIG_SALT_FUNC="null"
+if [ "$TEMP_CONFIG_DIR" != "null" ]; then
+
+    CONFIG_FUNC_NAMES="config_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_${ITYPE}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_salt"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_salt"
+
+    for FUNC_NAME in $(__strip_duplicates $CONFIG_FUNC_NAMES); do
+        if __function_defined $FUNC_NAME; then
+            CONFIG_SALT_FUNC=$FUNC_NAME
+            break
+        fi
+    done
+fi
+
+
 # Let's get the install function
-INSTALL_FUNC_NAMES="install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}"
+INSTALL_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}"
+INSTALL_FUNC_NAMES="$INSTALL_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}"
 INSTALL_FUNC_NAMES="$INSTALL_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}"
 
 INSTALL_FUNC="null"
-for FUNC_NAME in $INSTALL_FUNC_NAMES; do
+for FUNC_NAME in $(__strip_duplicates $INSTALL_FUNC_NAMES); do
     if __function_defined $FUNC_NAME; then
         INSTALL_FUNC=$FUNC_NAME
         break
@@ -906,32 +2264,17 @@ for FUNC_NAME in $INSTALL_FUNC_NAMES; do
 done
 
 
-# Let's get the minion config function
-CONFIG_MINION_FUNC="null"
-if [ "$TEMP_CONFIG_DIR" != "null" ]; then
-    CONFIG_FUNC_NAMES="config_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}_minion"
-    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_minon"
-    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_${ITYPE}_minion"
-    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_minion"
-    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_minion"
-
-    for FUNC_NAME in $CONFIG_FUNC_NAMES; do
-        if __function_defined $FUNC_NAME; then
-            CONFIG_MINION_FUNC=$FUNC_NAME
-            break
-        fi
-    done
-fi
-
-
 # Let's get the post install function
-POST_FUNC_NAMES="install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}_post"
-POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_post"
+POST_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_post"
 POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}_post"
 POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}_post"
 
+
 POST_INSTALL_FUNC="null"
-for FUNC_NAME in $POST_FUNC_NAMES; do
+for FUNC_NAME in $(__strip_duplicates $POST_FUNC_NAMES); do
     if __function_defined $FUNC_NAME; then
         POST_INSTALL_FUNC=$FUNC_NAME
         break
@@ -939,53 +2282,144 @@ for FUNC_NAME in $POST_FUNC_NAMES; do
 done
 
 
+# Let's get the start daemons install function
+STARTDAEMONS_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_restart_daemons"
+STARTDAEMONS_FUNC_NAMES="$STARTDAEMONS_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}_restart_daemons"
+STARTDAEMONS_FUNC_NAMES="$STARTDAEMONS_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_restart_daemons"
+STARTDAEMONS_FUNC_NAMES="$STARTDAEMONS_FUNC_NAMES install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_restart_daemons"
+STARTDAEMONS_FUNC_NAMES="$STARTDAEMONS_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}_restart_daemons"
+STARTDAEMONS_FUNC_NAMES="$STARTDAEMONS_FUNC_NAMES install_${DISTRO_NAME_L}_restart_daemons"
+
+STARTDAEMONS_INSTALL_FUNC="null"
+for FUNC_NAME in $(__strip_duplicates $STARTDAEMONS_FUNC_NAMES); do
+    if __function_defined $FUNC_NAME; then
+        STARTDAEMONS_INSTALL_FUNC=$FUNC_NAME
+        break
+    fi
+done
+
+
+# Let's get the daemons running check function.
+DAEMONS_RUNNING_FUNC="null"
+DAEMONS_RUNNING_FUNC_NAMES="daemons_running_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running_${DISTRO_NAME_L}_${ITYPE}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running_${DISTRO_NAME_L}"
+DAEMONS_RUNNING_FUNC_NAMES="$DAEMONS_RUNNING_FUNC_NAMES daemons_running"
+
+for FUNC_NAME in $(__strip_duplicates $DAEMONS_RUNNING_FUNC_NAMES); do
+    if __function_defined $FUNC_NAME; then
+        DAEMONS_RUNNING_FUNC=$FUNC_NAME
+        break
+    fi
+done
+
+
+
 if [ $DEPS_INSTALL_FUNC = "null" ]; then
-    echo " * ERROR: No dependencies installation function found. Exiting..."
+    echoerror "No dependencies installation function found. Exiting..."
     exit 1
 fi
 
 if [ $INSTALL_FUNC = "null" ]; then
-    echo " * ERROR: No installation function found. Exiting..."
+    echoerror "No installation function found. Exiting..."
     exit 1
 fi
 
 
 # Install dependencies
-echo " * Running ${DEPS_INSTALL_FUNC}()"
-$DEPS_INSTALL_FUNC
-if [ $? -ne 0 ]; then
-    echo " * Failed to run ${DEPS_INSTALL_FUNC}()!!!"
-    exit 1
+if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+    # Only execute function is not in config mode only
+    echoinfo "Running ${DEPS_INSTALL_FUNC}()"
+    $DEPS_INSTALL_FUNC
+    if [ $? -ne 0 ]; then
+        echoerror "Failed to run ${DEPS_INSTALL_FUNC}()!!!"
+        exit 1
+    fi
 fi
 
-# Install Salt
-echo " * Running ${INSTALL_FUNC}()"
-$INSTALL_FUNC
-if [ $? -ne 0 ]; then
-    echo " * Failed to run ${INSTALL_FUNC}()!!!"
-    exit 1
-fi
 
 # Configure Salt
-if [ "$TEMP_CONFIG_DIR" != "null" -a "$CONFIG_MINION_FUNC" != "null" ]; then
-    echo " * Running ${CONFIG_MINION_FUNC}()"
-    $CONFIG_MINION_FUNC
+if [ "$TEMP_CONFIG_DIR" != "null" ] && [ "$CONFIG_SALT_FUNC" != "null" ]; then
+    echoinfo "Running ${CONFIG_SALT_FUNC}()"
+    $CONFIG_SALT_FUNC
     if [ $? -ne 0 ]; then
-        echo " * Failed to run ${CONFIG_MINION_FUNC}()!!!"
+        echoerror "Failed to run ${CONFIG_SALT_FUNC}()!!!"
         exit 1
     fi
 fi
 
-# Run any post install function
-if [ "$POST_INSTALL_FUNC" != "null" ]; then
-    echo " * Running ${POST_INSTALL_FUNC}()"
+
+# Install Salt
+if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+    # Only execute function is not in config mode only
+    echoinfo "Running ${INSTALL_FUNC}()"
+    $INSTALL_FUNC
+    if [ $? -ne 0 ]; then
+        echoerror "Failed to run ${INSTALL_FUNC}()!!!"
+        exit 1
+    fi
+fi
+
+
+# Run any post install function, Only execute function is not in config mode only
+if [ $CONFIG_ONLY -eq $BS_FALSE ] && [ "$POST_INSTALL_FUNC" != "null" ]; then
+    echoinfo "Running ${POST_INSTALL_FUNC}()"
     $POST_INSTALL_FUNC
     if [ $? -ne 0 ]; then
-        echo " * Failed to run ${POST_INSTALL_FUNC}()!!!"
+        echoerror "Failed to run ${POST_INSTALL_FUNC}()!!!"
+        exit 1
+    fi
+fi
+
+
+# Run any start daemons function
+if [ "$STARTDAEMONS_INSTALL_FUNC" != "null" ]; then
+    echoinfo "Running ${STARTDAEMONS_INSTALL_FUNC}()"
+    $STARTDAEMONS_INSTALL_FUNC
+    if [ $? -ne 0 ]; then
+        echoerror "Failed to run ${STARTDAEMONS_INSTALL_FUNC}()!!!"
         exit 1
     fi
 fi
 
+# Check if the installed daemons are running or not
+if [ "$DAEMONS_RUNNING_FUNC" != "null" ]; then
+    sleep 3  # Sleep a little bit to let daemons start
+    echoinfo "Running ${DAEMONS_RUNNING_FUNC}()"
+    $DAEMONS_RUNNING_FUNC
+    if [ $? -ne 0 ]; then
+        echoerror "Failed to run ${DAEMONS_RUNNING_FUNC}()!!!"
+        echodebug "Running Processes:"
+        echodebug "$(ps auxwww)"
+
+        for fname in minion master syndic; do
+            # Skip if not meant to be installed
+            [ $fname = "minion" ] && [ $INSTALL_MINION -eq $BS_FALSE ] && continue
+            [ $fname = "master" ] && [ $INSTALL_MASTER -eq $BS_FALSE ] && continue
+            [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
+
+            [ ! $SALT_ETC_DIR/$fname ] && [ $fname != "syndic" ] && echodebug "$SALT_ETC_DIR/$fname does not exist"
+
+            echodebug "Running salt-$fname by hand outputs: $(salt-$fname -l debug)"
+
+            [ ! -f /var/log/salt/$fname ] && echodebug "/var/log/salt/$fname does not exist. Can't cat its contents!" && continue
+
+            echodebug "DEAMON LOGS for $fname:"
+            echodebug "$(cat /var/log/salt/$fname)"
+            echo
+        done
+        exit 1
+    fi
+fi
+
+
 # Done!
-echo " * Salt installed!"
+if [ $CONFIG_ONLY -eq $BS_FALSE ]; then
+    echoinfo "Salt installed!"
+else
+    echoinfo "Salt configured"
+fi
 exit 0