PERFORCE change 210763 for review

[Robert Watson]

http://p4web.freebsd.org/@@210763?ac=10

Change 210763 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/05/07 03:42:28

	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.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/conf/options#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/kern/init_main.c#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#3 (text+ko) ====

@@ -139,6 +139,12 @@
 #
 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

==== //depot/projects/ctsrd/beribsd/src/sys/conf/options#3 (text+ko) ====

@@ -66,6 +66,8 @@
 ADAPTIVE_LOCKMGRS
 ALQ
 AUDIT		opt_global.h
+BOOTHOWTO	opt_global.h
+BOOTVERBOSE	opt_global.h
 CAPABILITIES	opt_capsicum.h
 CAPABILITY_MODE	opt_capsicum.h
 CODA_COMPAT_5	opt_coda.h

==== //depot/projects/ctsrd/beribsd/src/sys/kern/init_main.c#2 (text+ko) ====

@@ -101,10 +101,17 @@
 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");