Thanks, applied to master.
On Fri, Nov 01, 2013 at 02:47:02PM -0700, Joe Stringer wrote:
> Acked-by: Joe Stringer <joestrin...@nicira.com>
>
> On Fri, Oct 11, 2013 at 4:53 PM, Ben Pfaff <b...@nicira.com> wrote:
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/daemon.c | 2 ++
> > lib/daemon.man | 7 ++++---
> > 2 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/daemon.c b/lib/daemon.c
> > index 1c9ebe2..54641d0 100644
> > --- a/lib/daemon.c
> > +++ b/lib/daemon.c
> > @@ -376,6 +376,8 @@ should_restart(int status)
> > {
> > if (WIFSIGNALED(status)) {
> > static const int error_signals[] = {
> > + /* This list of signals is documented in daemon.man. If you
> > + * change the list, update the documentation too. */
> > SIGABRT, SIGALRM, SIGBUS, SIGFPE, SIGILL, SIGPIPE, SIGSEGV,
> > SIGXCPU, SIGXFSZ
> > };
> > diff --git a/lib/daemon.man b/lib/daemon.man
> > index 7b07cb8..00de1a3 100644
> > --- a/lib/daemon.man
> > +++ b/lib/daemon.man
> > @@ -26,9 +26,10 @@ run as a background process. \*(DD
> > \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.
> > +(\fBSIGABRT\fR, \fBSIGALRM\fR, \fBSIGBUS\fR, \fBSIGFPE\fR,
> > +\fBSIGILL\fR, \fBSIGPIPE\fR, \fBSIGSEGV\fR, \fBSIGXCPU\fR, or
> > +\fBSIGXFSZ\fR) then the monitor process starts a new copy of it. If
> > +the daemon dies 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.
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
