git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif_netdev_execute: Extract flow key from the packet.
[sliver-openvswitch.git]
/
lib
/
daemon.c
diff --git
a/lib/daemon.c
b/lib/daemon.c
index
2c8cf32
..
54641d0
100644
(file)
--- a/
lib/daemon.c
+++ b/
lib/daemon.c
@@
-289,7
+289,6
@@
fork_and_clean_up(void)
fatal_signal_fork();
} else if (!pid) {
/* Running in child process. */
fatal_signal_fork();
} else if (!pid) {
/* Running in child process. */
- time_postfork();
lockfile_postfork();
}
return pid;
lockfile_postfork();
}
return pid;
@@
-377,6
+376,8
@@
should_restart(int status)
{
if (WIFSIGNALED(status)) {
static const int error_signals[] = {
{
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
};
SIGABRT, SIGALRM, SIGBUS, SIGFPE, SIGILL, SIGPIPE, SIGSEGV,
SIGXCPU, SIGXFSZ
};
@@
-529,6
+530,8
@@
daemonize_start(void)
/* Running in daemon process. */
}
/* Running in daemon process. */
}
+ forbid_forking("running in daemon process");
+
if (pidfile) {
make_pidfile();
}
if (pidfile) {
make_pidfile();
}