summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
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 118ab32..943db52 100644
--- a/init/init.c
+++ b/init/init.c
@@ -685,9 +685,15 @@ static void halt_signal(int sig)
{
shutdown_system();
message(CONSOLE|LOG,
+#if #cpu(s390)
+ /* Seems the s390 console is Wierd(tm). */
+ "The system is halted. You may reboot now.\n",
+#else
+ /* secondConsole is NULL for a serial console */
"The system is halted. Press %s or turn off power\n",
- (secondConsole == NULL) /* serial console */
- ? "Reset" : "CTRL-ALT-DEL");
+ (secondConsole == NULL)? "Reset" : "CTRL-ALT-DEL"
+#endif
+ );
sync();
/* allow time for last message to reach serial console */