projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
json 0.12 fixes
[project/procd.git]
/
signal.c
diff --git
a/signal.c
b/signal.c
index b62da0a8c1ce1016f0051959390e25ac88b030cb..16824f7251b5c01344c4f1dd939ed0daef9ac022 100644
(file)
--- a/
signal.c
+++ b/
signal.c
@@
-19,14
+19,12
@@
#include "procd.h"
#include "procd.h"
-static int preinit;
-
static void do_reboot(void)
{
LOG("reboot\n");
fflush(stderr);
sync();
static void do_reboot(void)
{
LOG("reboot\n");
fflush(stderr);
sync();
- sleep(
1
);
+ sleep(
2
);
reboot(RB_AUTOBOOT);
while (1)
;
reboot(RB_AUTOBOOT);
while (1)
;
@@
-37,10
+35,8
@@
static void signal_shutdown(int signal, siginfo_t *siginfo, void *data)
int event = 0;
char *msg = NULL;
int event = 0;
char *msg = NULL;
- if (preinit)
- do_reboot();
-
switch(signal) {
switch(signal) {
+ case SIGINT:
case SIGTERM:
event = RB_AUTOBOOT;
msg = "reboot";
case SIGTERM:
event = RB_AUTOBOOT;
msg = "reboot";
@@
-89,6
+85,7
@@
void procd_signal(void)
if (getpid() != 1)
return;
sigaction(SIGTERM, &sa_shutdown, NULL);
if (getpid() != 1)
return;
sigaction(SIGTERM, &sa_shutdown, NULL);
+ sigaction(SIGINT, &sa_shutdown, NULL);
sigaction(SIGUSR1, &sa_shutdown, NULL);
sigaction(SIGUSR2, &sa_shutdown, NULL);
sigaction(SIGSEGV, &sa_crash, NULL);
sigaction(SIGUSR1, &sa_shutdown, NULL);
sigaction(SIGUSR2, &sa_shutdown, NULL);
sigaction(SIGSEGV, &sa_crash, NULL);
@@
-96,12
+93,5
@@
void procd_signal(void)
sigaction(SIGHUP, &sa_dummy, NULL);
sigaction(SIGKILL, &sa_dummy, NULL);
sigaction(SIGSTOP, &sa_dummy, NULL);
sigaction(SIGHUP, &sa_dummy, NULL);
sigaction(SIGKILL, &sa_dummy, NULL);
sigaction(SIGSTOP, &sa_dummy, NULL);
-}
-
-void procd_signal_preinit(void)
-{
- preinit = 1;
- sigaction(SIGTERM, &sa_shutdown, NULL);
- sigaction(SIGUSR1, &sa_shutdown, NULL);
- sigaction(SIGUSR2, &sa_shutdown, NULL);
+ reboot(RB_DISABLE_CAD);
}
}