Patch from vodz:

[oweals/busybox.git] / init / reboot.c

diff --git a/init/reboot.c b/init/reboot.c
index e9f9ff83172aa0394bc52c5feb35406cda2f0643..185152a71ade289d3d749e80c39d37e65f9c4668 100644 (file)
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -2,7 +2,6 @@
 /*
  * Mini reboot implementation for busybox
  *
- * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,23 +24,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
-
+#include <sys/reboot.h>
 #include "busybox.h"
 #include "init_shared.h"
 
 
-#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) 
-  #include <sys/reboot.h>
-  #define init_reboot(magic) reboot(magic)
-#else
-  #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
-#endif
-
-#ifndef RB_ENABLE_CAD
-static const int RB_ENABLE_CAD = 0x89abcdef;
-static const int RB_AUTOBOOT = 0x01234567;
-#endif
-
 extern int reboot_main(int argc, char **argv)
 {
        char *delay; /* delay in seconds before rebooting */
@@ -50,32 +37,11 @@ extern int reboot_main(int argc, char **argv)
                sleep(atoi(delay));
        }
 
-#ifdef CONFIG_USER_INIT
-               /* Don't kill ourself */
-        signal(SIGTERM,SIG_IGN);
-        signal(SIGHUP,SIG_IGN);
-        setpgrp();
-
-               /* Allow Ctrl-Alt-Del to reboot system. */
-               init_reboot(RB_ENABLE_CAD);
-
-               message(CONSOLE|LOG, "\n\rThe system is going down NOW !!\n");
-               sync();
-
-               /* Send signals to every process _except_ pid 1 */
-               message(CONSOLE|LOG, "\rSending SIGTERM to all processes.\n");
-               kill(-1, SIGTERM);
-               sleep(1);
-               sync();
-
-               message(CONSOLE|LOG, "\rSending SIGKILL to all processes.\n");
-               kill(-1, SIGKILL);
-               sleep(1);
-
-               sync();
-
-               init_reboot(RB_AUTOBOOT);
-               return 0; /* Shrug */
+#ifndef CONFIG_INIT
+#ifndef RB_AUTOBOOT
+#define RB_AUTOBOOT            0x01234567
+#endif
+       return(bb_shutdown_system(RB_AUTOBOOT));
 #else
        return kill_init(SIGTERM);
 #endif