Merge pull request #3139 from seanchannel/develop

whack-a-mole
This commit is contained in:
Sean Channel 2013-01-03 16:07:12 -08:00
commit ef6f7a4f93
2 changed files with 1 additions and 4 deletions

View File

@ -5,7 +5,4 @@ start on (net-device-up
and runlevel [2345])
stop on runlevel [!2345]
# work-around for unpredictable exit codes
normal exit 0 1 9 15 143 SIGTERM SIGKILL
exec /usr/bin/salt-master >/dev/null 2>&1

View File

@ -6,6 +6,6 @@ start on (net-device-up
stop on runlevel [!2345]
# work-around for unpredictable exit codes
normal exit 0 1 9 15 143 SIGTERM SIGKILL
normal exit 0 1 2 9 15 143 SIGTERM SIGKILL SIGINT
exec /usr/bin/salt-minion >/dev/null 2>&1