X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=signal.c;h=07dda9a4c890e9106a56ec089c6f8bfcdefb22a0;hp=f705e5d2a091729240b66877a4934127a3178a48;hb=7c6cf551df1eb4b59b2576c73db7ad30ac4ce396;hpb=9961e88dd853a30503298378679d2cedc497410e

diff --git a/signal.c b/signal.c
index f705e5d..07dda9a 100644
--- a/signal.c
+++ b/signal.c
@@ -19,14 +19,12 @@
 
 #include "procd.h"
 
-static int preinit;
-
 static void do_reboot(void)
 {
 	LOG("reboot\n");
 	fflush(stderr);
 	sync();
-	sleep(1);
+	sleep(2);
 	reboot(RB_AUTOBOOT);
 	while (1)
 	;
@@ -37,10 +35,9 @@ static void signal_shutdown(int signal, siginfo_t *siginfo, void *data)
 	int event = 0;
 	char *msg = NULL;
 
-	if (preinit)
-		do_reboot();
-
+#ifndef DISABLE_INIT
 	switch(signal) {
+	case SIGINT:
 	case SIGTERM:
 		event = RB_AUTOBOOT;
 		msg = "reboot";
@@ -51,6 +48,7 @@ static void signal_shutdown(int signal, siginfo_t *siginfo, void *data)
 		msg = "poweroff";
 		break;
 	}
+#endif
 
 	DEBUG(1, "Triggering %s\n", msg);
 	if (event)
@@ -85,10 +83,11 @@ struct sigaction sa_dummy = {
 
 void procd_signal(void)
 {
-	sigaction(SIGPIPE, &sa_dummy, NULL);
+	signal(SIGPIPE, SIG_IGN);
 	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);
@@ -96,12 +95,7 @@ void procd_signal(void)
 	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);
+#ifndef DISABLE_INIT
+	reboot(RB_DISABLE_CAD);
+#endif
 }