From bc0875b26c5227e99c7574d157ba830638300d87 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sun, 3 May 2015 15:57:02 +0100
Subject: [PATCH] Add required variable into scope.

Check for systemd first
---
 bootstrap-salt.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index f9c2440..afbbf95 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1756,6 +1756,7 @@ install_ubuntu_deps() {
         __PIP_PACKAGES="'requests>=$_PY_REQUESTS_MIN_VERSION'"
     elif [ "$DISTRO_MAJOR_VERSION" -ge 15 ]; then
         __apt_get_install_noinput python-requests
+        __PIP_PACKAGES=""
     fi
 
     # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
@@ -1923,8 +1924,11 @@ install_ubuntu_restart_daemons() {
     [ $_START_DAEMONS -eq $BS_FALSE ] && return
 
     # Ensure upstart configs are loaded
-    [ -f /sbin/initctl ] && /sbin/initctl reload-configuration
-    [ -f /bin/systemctl ] && systemctl daemon-reload
+    if [ -f /bin/systemctl ]; then
+        systemctl daemon-reload
+    elif [ -f /sbin/initctl ]; then
+        /sbin/initctl reload-configuration
+    fi
     for fname in minion master syndic api; do
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue