tech-kern archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Another option issue [was Re: Rump makes the kernel problematically brittle]



I wrote about build.sh release failing.  Someone (again off-list)
pointed out that I didn't really give enough information.  And, this
time, the change is small.

So, here is the changeset in question:

commit e1f85bf071f6fcc167b5266da1db35c3ee9a8969
Author: Mouse <mouse%Rodents-Montreal.ORG@localhost>
Date:   Wed Oct 17 13:17:47 2018 -0400

    Add `options HALTED_MESSAGE' to control what's printed on halt.

diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index a21a084..a9e7011 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -127,6 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.102.4.14 2012/06/12 23:18:13 riz Exp $
 #include "opt_lockdebug.h"
 #include "opt_mtrr.h"
 #include "opt_realmem.h"
+#include "opt_halted_message.h"
 #include "opt_xen.h"
 #ifndef XEN
 #include "opt_physmem.h"
@@ -732,9 +733,13 @@ haltsys:
 		AcpiDisable();
 #endif
 
+#ifdef HALTED_MESSAGE
+		printf("%s",HALTED_MESSAGE);
+#else
 		printf("\n");
 		printf("The operating system has halted.\n");
 		printf("Please press any key to reboot.\n\n");
+#endif
 		cnpollc(1);	/* for proper keyboard command handling */
 		cngetc();
 		cnpollc(0);
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 923ad4f..19df2cd 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -12,6 +12,8 @@ maxpartitions 16
 
 maxusers 2 16 128
 
+defparam opt_halted_message.h HALTED_MESSAGE
+
 # delay before cpu_reset() for reboot.
 defparam		CPURESET_DELAY
 

/~\ The ASCII				  Mouse
\ / Ribbon Campaign
 X  Against HTML		mouse%rodents-montreal.org@localhost
/ \ Email!	     7D C8 61 52 5D E7 2D 39  4E F1 31 3E E8 B3 27 4B


Home | Main Index | Thread Index | Old Index