From owner-p4-projects@FreeBSD.ORG Thu Jul 6 22:27:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D1C516A4EA; Thu, 6 Jul 2006 22:27:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28F0316A4E8 for ; Thu, 6 Jul 2006 22:27:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A897C43D6A for ; Thu, 6 Jul 2006 22:27:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66MRnkT054554 for ; Thu, 6 Jul 2006 22:27:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66MRnME054551 for perforce@freebsd.org; Thu, 6 Jul 2006 22:27:49 GMT (envelope-from jb@freebsd.org) Date: Thu, 6 Jul 2006 22:27:49 GMT Message-Id: <200607062227.k66MRnME054551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 22:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=100810 Change 100810 by jb@jb_freebsd2 on 2006/07/06 22:27:48 Change 'dtrace_load' to 'dtrace_boot' as the environment variable name so that it isn't confused with the load flag for the dtrace module on i386. Setting 'dtrace_boot=1' in loader.conf is the way to boot with DTrace modules and anonymous enablings on architectures that don't use the Forth menu. Affected files ... .. //depot/projects/dtrace/src/sys/boot/common/boot.c#5 edit .. //depot/projects/dtrace/src/sys/boot/forth/beastie.4th#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/boot/common/boot.c#5 (text+ko) ==== @@ -105,7 +105,7 @@ return(CMD_ERROR); /* Check if DTrace is to be loaded prior to boot. */ - if (getenv("dtrace_load")) { + if (getenv("dtrace_boot")) { /* * Load the DTrace modules. This would be better done * in 4th so that extra providers can be added easily. ==== //depot/projects/dtrace/src/sys/boot/forth/beastie.4th#4 (text+ko) ==== @@ -286,7 +286,7 @@ 0 boot then dup bootdtracekey @ = if - s" YES" s" dtrace_load" setenv + s" YES" s" dtrace_boot" setenv 0 boot then dup escapekey @ = if