aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-11-20 05:42:57 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-11-20 05:42:57 +0000
commite8a94e40fdf7989a4b49e63e1012ef9efcf763ca (patch)
treec2ea132bf26288fca6b65e7fe88fd605fda46843 /init
parent5695914e97ef8a4843a284b3913ba2488fb57ebe (diff)
downloadbusybox-w32-e8a94e40fdf7989a4b49e63e1012ef9efcf763ca.tar.gz
busybox-w32-e8a94e40fdf7989a4b49e63e1012ef9efcf763ca.tar.bz2
busybox-w32-e8a94e40fdf7989a4b49e63e1012ef9efcf763ca.zip
S390 wierdness
git-svn-id: svn://busybox.net/trunk/busybox@3743 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'init')
-rw-r--r--init/init.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c
index 118ab327a..943db5261 100644
--- a/init/init.c
+++ b/init/init.c
@@ -685,9 +685,15 @@ static void halt_signal(int sig)
685{ 685{
686 shutdown_system(); 686 shutdown_system();
687 message(CONSOLE|LOG, 687 message(CONSOLE|LOG,
688#if #cpu(s390)
689 /* Seems the s390 console is Wierd(tm). */
690 "The system is halted. You may reboot now.\n",
691#else
692 /* secondConsole is NULL for a serial console */
688 "The system is halted. Press %s or turn off power\n", 693 "The system is halted. Press %s or turn off power\n",
689 (secondConsole == NULL) /* serial console */ 694 (secondConsole == NULL)? "Reset" : "CTRL-ALT-DEL"
690 ? "Reset" : "CTRL-ALT-DEL"); 695#endif
696 );
691 sync(); 697 sync();
692 698
693 /* allow time for last message to reach serial console */ 699 /* allow time for last message to reach serial console */