* Fixed rebooting from init. I'd left some debugging code in

    which blocked reboots.  Oops.
 -Erik

diff --git a/Changelog b/Changelog
index 99963cef969e3a9d319851086f3ce916448dbd27..4655b7cd884fb444216d32820a736db507cd51e1 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,8 @@
        * kill now behaves itself properly, added 'kill -l' to list signals
        * 'ls -l' was failing on long directories, since my_getid was leaking 
            one file descriptor per file.  Oops.
+       * Fixed rebooting from init.  I'd left some debugging code in
+           which blocked reboots.
 
        -Erik Andrsen
 

diff --git a/init.c b/init.c
index 164ee69a32a2742eaee180aea6b984e4035451eb..d2e9a7e970834b00b8880dce980e369daa28d2a3 100644 (file)
--- a/init.c
+++ b/init.c
@@ -418,7 +418,6 @@ static void halt_signal(int sig)
            "The system is halted. Press CTRL-ALT-DEL or turn off power\r\n");
     sync();
 #ifndef DEBUG_INIT
-    while (1) sleep(1);
     reboot(RB_HALT_SYSTEM);
     //reboot(RB_POWER_OFF);
 #endif
@@ -430,7 +429,6 @@ static void reboot_signal(int sig)
     shutdown_system();
     message(CONSOLE, "Please stand by while rebooting the system.\r\n");
     sync();
-    while (1) sleep(1);
 #ifndef DEBUG_INIT
     reboot(RB_AUTOBOOT);
 #endif

diff --git a/init/init.c b/init/init.c
index 164ee69a32a2742eaee180aea6b984e4035451eb..d2e9a7e970834b00b8880dce980e369daa28d2a3 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -418,7 +418,6 @@ static void halt_signal(int sig)
            "The system is halted. Press CTRL-ALT-DEL or turn off power\r\n");
     sync();
 #ifndef DEBUG_INIT
-    while (1) sleep(1);
     reboot(RB_HALT_SYSTEM);
     //reboot(RB_POWER_OFF);
 #endif
@@ -430,7 +429,6 @@ static void reboot_signal(int sig)
     shutdown_system();
     message(CONSOLE, "Please stand by while rebooting the system.\r\n");
     sync();
-    while (1) sleep(1);
 #ifndef DEBUG_INIT
     reboot(RB_AUTOBOOT);
 #endif