Fix https://github.com/saltstack/salt/issues/6785

pkg/rpm/salt-master

@@ -24,16 +24,6 @@
 # processname: /usr/bin/salt-master
 
 
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-else
-    SALTMASTER=/usr/bin/salt-master
-    PYTHON=/usr/bin/python
-fi
-
-# Sanity checks.
-[ -x $SALTMASTER ] || exit 0
-
 DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
@@ -45,6 +35,16 @@ else
     . /etc/rc.d/init.d/functions
 fi
 
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+else
+    SALTMASTER=/usr/bin/salt-master
+    PYTHON=/usr/bin/python
+fi
+
+# Sanity checks.
+[ -x $SALTMASTER ] || exit 0
+
 SERVICE=salt-master
 PROCESS=salt-master
 CONFIG_ARGS=" "

pkg/rpm/salt-minion

@@ -25,16 +25,6 @@
 # processname: /usr/bin/salt-minion
 
 
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-else
-    SALTMINION=/usr/bin/salt-minion
-    PYTHON=/usr/bin/python
-fi
-
-# Sanity checks.
-[ -x $SALTMINION ] || exit 0
-
 DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
@@ -46,6 +36,16 @@ else
     . /etc/rc.d/init.d/functions
 fi
 
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+else
+    SALTMINION=/usr/bin/salt-minion
+    PYTHON=/usr/bin/python
+fi
+
+# Sanity checks.
+[ -x $SALTMINION ] || exit 0
+
 SERVICE=salt-minion
 PROCESS=salt-minion
 CONFIG_ARGS=" "

pkg/rpm/salt-syndic

@@ -25,16 +25,6 @@
 # processname: /usr/bin/salt-syndic
 
 
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-else
-    SALTSYNDIC=/usr/bin/salt-syndic
-    PYTHON=/usr/bin/python
-fi
-
-# Sanity checks.
-[ -x $SALTSYNDIC ] || exit 0
-
 DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
@@ -46,6 +36,16 @@ else
     . /etc/rc.d/init.d/functions
 fi
 
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+else
+    SALTSYNDIC=/usr/bin/salt-syndic
+    PYTHON=/usr/bin/python
+fi
+
+# Sanity checks.
+[ -x $SALTSYNDIC ] || exit 0
+
 SERVICE=salt-syndic
 PROCESS=salt-syndic
 CONFIG_ARGS=" "

pkg/rpm/salt.spec

@@ -308,6 +308,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 11 2013 David Anderson <dave@dubkat.com>
+- Change sourcing order of init functions and salt default file
+
 * Sun Aug 25 2013 Florian La Roche <Florian.LaRoche@gmx.net>
 - fixed preun/postun scripts for salt-minion
 

pkg/salt-master.upstart

@@ -7,5 +7,8 @@ stop on runlevel [!2345]
 limit nofile 100000 100000
 
 script
-exec salt-master
+  # Read configuration variable file if it is present
+  [ -f /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+  exec salt-master
 end script

pkg/salt-minion.upstart

@@ -13,5 +13,8 @@ stop on runlevel [!2345]
 #respawn limit 10 5
 
 script
-exec salt-minion
+  # Read configuration variable file if it is present
+  [ -f /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+  exec salt-minion
 end script

pkg/salt-syndic.upstart

@@ -5,4 +5,9 @@ start on (net-device-up
           and runlevel [2345])
 stop on runlevel [!2345]
 
-exec salt-syndic
+script
+  # Read configuration variable file if it is present
+  [ -f /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+  exec salt-syndic
+end script