emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start-stop-daemon: warn if calling --start with --retry or --stop with --wait

Browse Source 
This fixes #122
This commit is contained in:
Austin English 2017-03-31 13:59:38 -05:00 committed by William Hubbs
parent 55a87a30ec
commit 9eb669591e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rc/start-stop-daemon.c
View File

@ -960,6 +960,9 @@ int main(int argc, char **argv)
if (redirect_stdout || redirect_stderr) if (redirect_stdout || redirect_stderr)
eerrorx("%s: --stdout and --stderr are only relevant" eerrorx("%s: --stdout and --stderr are only relevant"
" with --start", applet); " with --start", applet);
if (start_wait)
ewarn("using --wait with --stop has no effect,"
" use --retry instead");
} else { } else {
if (!exec) if (!exec)
eerrorx("%s: nothing to start", applet); eerrorx("%s: nothing to start", applet);
@ -1012,7 +1015,11 @@ int main(int argc, char **argv)
eerror("%s: %s does not exist", applet, eerror("%s: %s does not exist", applet,
*exec_file ? exec_file : exec); *exec_file ? exec_file : exec);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (start && retry)
ewarn("using --retry with --start has no effect,"
" use --wait instead");
/* If we don't have a pidfile we should check if it's interpreted /* If we don't have a pidfile we should check if it's interpreted
* or not. If it we, we need to pass the interpreter through * or not. If it we, we need to pass the interpreter through