From owner-p4-projects@FreeBSD.ORG Mon May 7 03:43:20 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69DB61065673; Mon, 7 May 2012 03:43:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D31E106566C for ; Mon, 7 May 2012 03:43:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C63DB8FC12 for ; Mon, 7 May 2012 03:43:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q473hJMG077898 for ; Mon, 7 May 2012 03:43:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q473hJSI077894 for perforce@freebsd.org; Mon, 7 May 2012 03:43:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 7 May 2012 03:43:19 GMT Message-Id: <201205070343.q473hJSI077894@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 03:43:20 -0000 http://p4web.freebsd.org/@@210763?ac=10 Change 210763 by rwatson@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");