From owner-svn-src-head@FreeBSD.ORG Wed Apr 3 22:24:37 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5EE177C5; Wed, 3 Apr 2013 22:24:37 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 38BBB372; Wed, 3 Apr 2013 22:24:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33MObSY000289; Wed, 3 Apr 2013 22:24:37 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33MOaax000285; Wed, 3 Apr 2013 22:24:36 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201304032224.r33MOaax000285@svn.freebsd.org> From: Brooks Davis Date: Wed, 3 Apr 2013 22:24:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249071 - in head/sys: conf kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 22:24:37 -0000 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");