X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdaemon.man;h=046f9eadbc9c73bb765161f5b37312e082e6b843;hb=79c9f2ee7883b52860c76c3730725f5731402874;hp=cc1a2b5695353d8835f42b86d3737b7b2a722ccd;hpb=91a1e24d09ba1f08b1f8c08815f595187c6ef946;p=openvswitch

diff --git a/lib/daemon.man b/lib/daemon.man
index cc1a2b56..046f9ead 100644
--- a/lib/daemon.man
+++ b/lib/daemon.man
@@ -1,28 +1,38 @@
 .TP
-\fB-P\fR[\fIpidfile\fR], \fB--pidfile\fR[\fB=\fIpidfile\fR]
+\fB--pidfile\fR[\fB=\fIpidfile\fR]
 Causes a file (by default, \fB\*(PN.pid\fR) to be created indicating
 the PID of the running process.  If \fIpidfile\fR is not specified, or
 if it does not begin with \fB/\fR, then it is created in
 \fB@RUNDIR@\fR.
-
+.
 .TP
-\fB-f\fR, \fB--force\fR
-By default, when \fB-P\fR or \fB--pidfile\fR is specified and the
-specified pidfile already exists and is locked by a running process,
-\fB\*(PN\fR refuses to start.  Specify \fB-f\fR or \fB--force\fR
-to cause it to instead overwrite the pidfile.
-
-When \fB-P\fR or \fB--pidfile\fR is not specified, this option has no
-effect.
-
+\fB--overwrite-pidfile\fR
+By default, when \fB--pidfile\fR is specified and the specified pidfile 
+already exists and is locked by a running process, \fB\*(PN\fR refuses 
+to start.  Specify \fB--overwrite-pidfile\fR to cause it to instead 
+overwrite the pidfile.
+.IP
+When \fB--pidfile\fR is not specified, this option has no effect.
+.
 .TP
-\fB-D\fR, \fB--detach\fR
+\fB--detach\fR
 Causes \fB\*(PN\fR to detach itself from the foreground session and
 run as a background process.
-
+.
+.TP
+\fB--monitor\fR
+Creates an additional process to monitor the \fB\*(PN\fR daemon.  If
+the daemon dies due to a signal that indicates a programming error
+(e.g. \fBSIGSEGV\fR, \fBSIGABRT\fR), then the monitor process starts a
+new copy of it.  If the daemon die or exits for another reason, the
+monitor process exits.
+.IP
+This option is normally used with \fB--detach\fR, but it also
+functions without it.
+.
 .TP
 \fB--no-chdir\fR
-By default, when \fB-D\fR or \fB--detach\fR is specified, \fB\*(PN\fR 
+By default, when \fB--detach\fR is specified, \fB\*(PN\fR 
 changes its current working directory to the root directory after it 
 detaches.  Otherwise, invoking \fB\*(PN\fR from a carelessly chosen 
 directory would prevent the administrator from unmounting the file 
@@ -34,5 +44,4 @@ useful for collecting core files, since it is common behavior to write
 core dumps into the current working directory and the root directory 
 is not a good directory to use.
 .IP
-This option has no effect when neither \fB-D\fR nor \fB--detach\fR is 
-specified.
+This option has no effect when \fB--detach\fR is not specified.