From 65fc09e312c8a62a196e1235593bcffcaf38a261 Mon Sep 17 00:00:00 2001
From: Alec Koumjian <akoumjian@gmail.com>
Date: Thu, 20 Dec 2012 09:58:17 -0800
Subject: [PATCH] remove installing salt deb from debian squeeze git install

---
 bootstrap-salt-minion.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh
index 86acda1..d589aba 100755
--- a/bootstrap-salt-minion.sh
+++ b/bootstrap-salt-minion.sh
@@ -553,7 +553,7 @@ install_debian_60_deps() {
         /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,msgpack-python,python-zmq}; do
+    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"
@@ -577,7 +577,7 @@ install_debian_60() {
 install_debian_git_deps() {
     apt-get update
     __apt_get_noinput lsb-release python python-pkg-resources python-crypto \
-        python-jinja2 python-m2crypto python-yaml msgpack-python git
+        python-jinja2 python-m2crypto python-yaml msgpack-python git python-zmq
 }
 
 install_debian_git() {
@@ -592,12 +592,11 @@ install_debian_git() {
 }
 
 install_debian_60_git_deps() {
-    install_debian_60_stable_deps
-    install_debian_60_stable
+    install_debian_60_deps # Add backports
+    install_debian_git_deps # Grab the actual deps
 }
 
 install_debian_60_git() {
-    __apt_get_noinput git
     apt-get -y purge salt-minion
 
     __git_clone_and_checkout
@@ -610,6 +609,20 @@ install_debian_60_git() {
         CONFIG_MINION_FUNC="config_minion"
     fi
 }
+
+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
+}
 #
 #   Ended Debian Install Functions
 #