Author: brooks
Date: Wed Apr 3 22:24:36 2013
New Revision: 249071
URL: http://svnweb.freebsd.org/changeset/base/249071
Log:
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
Modified:
head/sys/conf/NOTES
head/sys/conf/options
head/sys/kern/init_main.c
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Wed Apr 3 21:55:19 2013 (r249070)
+++ head/sys/conf/NOTES Wed Apr 3 22:24:36 2013 (r249071)
@@ -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
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Wed Apr 3 21:55:19 2013 (r249070)
+++ head/sys/conf/options Wed Apr 3 22:24:36 2013 (r249071)
@@ -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
Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c Wed Apr 3 21:55:19 2013 (r249070)
+++ head/sys/kern/init_main.c Wed Apr 3 22:24:36 2013 (r249071)
@@ -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");
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
