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

which blocked reboots.  Oops.
 -Erik
This commit is contained in:
Eric Andersen 1999-12-09 07:57:58 +00:00
parent 1792f8c489
commit f0758dd6ba
3 changed files with 2 additions and 4 deletions

View File

@ -12,6 +12,8 @@
* kill now behaves itself properly, added 'kill -l' to list signals * kill now behaves itself properly, added 'kill -l' to list signals
* 'ls -l' was failing on long directories, since my_getid was leaking * 'ls -l' was failing on long directories, since my_getid was leaking
one file descriptor per file. Oops. one file descriptor per file. Oops.
* Fixed rebooting from init. I'd left some debugging code in
which blocked reboots.
-Erik Andrsen -Erik Andrsen

2
init.c
View File

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

View File

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