valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #4410, make sure that "ssh root@host -C service salt-minio restart" will return.

Browse Source
This commit is contained in:
C. R. Oldham 2013-10-25 17:20:10 -06:00
parent ee5ddb4972
commit 5c58d4f245
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/rpm/salt-minion
View File

@ -65,11 +65,22 @@ start() {
fi
else
if [ $(pidofproc $PROCESS) ]; then
RETVAL=$?
echo -n "already running"
RETVAL=$?
echo -n "already running"
else
daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
RETVAL=$?
# The RHEL 'daemon' function doesn't redirect stdout/err
# quite right, executing 'service salt-minion start' as a one-off
# over ssh like 'ssh root@ip -C service salt-minion start'
# will not return.
# daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
# RETVAL=$?
if $PYTHON $SALTMINION -d $MINION_ARGS >& /dev/null; then
echo_success
RETVAL=0
else
RETVAL=$?
fi
fi
fi
echo