Permalink
Browse files

MFP4 change 210763

Allow boothowto and bootverbose to be set via kernel options, which
is useful on architectures that are unable to rely on a boot loader
to pass configuration variables to the kernel.

Submitted by:	rwatson
  • Loading branch information...
brooksdavis committed Apr 3, 2013
1 parent 2ca30a8 commit 2a56708b496c5acdcbc0433409ee7f7f7fa9d02a
Showing with 17 additions and 2 deletions.
  1. +6 −0 sys/conf/NOTES
  2. +2 −0 sys/conf/options
  3. +9 −2 sys/kern/init_main.c
View
@@ -139,6 +139,12 @@ options MAXPHYS=(128*1024)
#
options INCLUDE_CONFIG_FILE # Include this file in kernel
+#
+# Compile-time defaults for various boot parameters
+#
+options BOOTVERBOSE=1
+options BOOTHOWTO=RB_MULTIPLE
+
options GEOM_AES # Don't use, use GEOM_BDE
options GEOM_BDE # Disk encryption.
options GEOM_BSD # BSD disklabels
View
@@ -68,6 +68,8 @@ TEXTDUMP_VERBOSE opt_ddb.h
ADAPTIVE_LOCKMGRS
ALQ
AUDIT opt_global.h
+BOOTHOWTO opt_global.h
+BOOTVERBOSE opt_global.h
CALLOUT_PROFILING
CAPABILITIES opt_capsicum.h
CAPABILITY_MODE opt_capsicum.h
View
@@ -101,10 +101,17 @@ struct thread thread0 __aligned(16);
struct vmspace vmspace0;
struct proc *initproc;
-int boothowto = 0; /* initialized so that it can be patched */
+#ifndef BOOTHOWTO
+#define BOOTHOWTO 0
+#endif
+int boothowto = BOOTHOWTO; /* initialized so that it can be patched */
SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0,
"Boot control flags, passed from loader");
-int bootverbose;
+
+#ifndef BOOTVERBOSE
+#define BOOTVERBOSE 0
+#endif
+int bootverbose = BOOTVERBOSE;
SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0,
"Control the output of verbose kernel messages");

0 comments on commit 2a56708

Please sign in to comment.