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

s-s-d now allows --signal to be used without --stop and --oknodo. man page updated accordingly

Browse Source
This commit is contained in:
Roy Marples 2007-04-13 09:21:16 +00:00
parent 824e9577e7
commit a07be0513a
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
man/start-stop-daemon.8
View File

@ -1,4 +1,4 @@
.TH "BASELAYOUT" "8" "March 2007" "baselayout" "baselayout" .TH "BASELAYOUT" "13" "April 2007" "baselayout" "baselayout"
.SH NAME .SH NAME
start\-stop\-daemon \- start and stop system daemon programs start\-stop\-daemon \- start and stop system daemon programs
.SH SYNOPSIS .SH SYNOPSIS
@ -13,6 +13,10 @@ start\-stop\-daemon \- start and stop system daemon programs
.IR options .IR options
.HP .HP
.B start-stop-daemon .B start-stop-daemon
.BR -s | --signal
.IR options
.HP
.B start-stop-daemon
.BR -H | --help .BR -H | --help
.HP .HP
.B start-stop-daemon .B start-stop-daemon
@ -62,7 +66,26 @@ exits with error status 1. If
is specified then we just send the signal and not the schedule. If is specified then we just send the signal and not the schedule. If
.BR --oknodo .BR --oknodo
is specified then we don't remove the daemon information from is specified then we don't remove the daemon information from
.BR rc. .BR rc. If neither
.BR --test
or
.BR --okndo
are specified then we kill signalling and waiting according to our
schedule specified by
.BR --retry
until we timeout the process(es) exited. If we didn't timeout then
we remove our daemon information from rc.
With
.BR --signal ,
.B start\-stop\-daemon
also checks for the existence of a specified process.
If such a process exists,
.B start\-stop\-daemon
sends it the signal specified and exits with error status 0.
If such a process does not exist, or there was an error stopping it
.B start\-stop\-daemon
exits with error status 1. No futher action is taken
.SH OPTIONS .SH OPTIONS
@ -142,6 +165,7 @@ but take no action.
.TP .TP
.BR -o | --oknodo .BR -o | --oknodo
Used for sending signals to a running daemon but not expecting it to stop. Used for sending signals to a running daemon but not expecting it to stop.
In this version you can don't need --oknodo if you don't use --stop either.
.TP .TP
.BR -q | --quiet .BR -q | --quiet
Do not print informational messages; only display error messages. Do not print informational messages; only display error messages.

12
src/start-stop-daemon.c
View File

@ -680,6 +680,18 @@ int main (int argc, char **argv)
if (rc_is_env ("RC_QUIET", "yes") && ! verbose) if (rc_is_env ("RC_QUIET", "yes") && ! verbose)
quiet = true; quiet = true;
/* Allow start-stop-daemon --signal HUP --exec /usr/sbin/dnsmasq
* instead of forcing --stop --oknodo as well */
if (! start && ! stop)
if (sig != SIGINT &&
sig != SIGTERM &&
sig != SIGQUIT &&
sig != SIGKILL)
{
oknodo = true;
stop = true;
}
if (start == stop) if (start == stop)
eerrorx ("%s: need one of --start or --stop", progname); eerrorx ("%s: need one of --start or --stop", progname);