From owner-svn-src-head@FreeBSD.ORG  Sat Jun  8 21:33:10 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0BFE86CB;
 Sat,  8 Jun 2013 21:33:10 +0000 (UTC)
 (envelope-from dteske@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 F283A15E8;
 Sat,  8 Jun 2013 21:33:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58LX9qB020176;
 Sat, 8 Jun 2013 21:33:09 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58LX97F020175;
 Sat, 8 Jun 2013 21:33:09 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306082133.r58LX97F020175@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 8 Jun 2013 21:33:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251556 - head/usr.sbin/bsdconfig/startup/share
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jun 2013 21:33:10 -0000

Author: dteske
Date: Sat Jun  8 21:33:09 2013
New Revision: 251556
URL: http://svnweb.freebsd.org/changeset/base/251556

Log:
  Fix a bug introduced with r249751, in which a small hunk was forgotten in
  the performance conversion process.
  
  The effect of this was, when your /etc/defaults/rc.conf file changed
  (based on md5(1)) and re-generating the file startup_rcconf_map.cache in
  /var/run/bsdconfig/ you would get a screen-dump of its contents before the
  menu would appear.

Modified:
  head/usr.sbin/bsdconfig/startup/share/rcconf.subr

Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Sat Jun  8 21:11:26 2013	(r251555)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Sat Jun  8 21:33:09 2013	(r251556)
@@ -207,7 +207,11 @@ f_startup_rcconf_map()
 	)
 	export STARTUP_RCCONF_MAP
 	export _STARTUP_RCCONF_MAP=1
-	echo "$STARTUP_RCCONF_MAP"
+	if [ "$__var_to_set" ]; then
+		setvar "$__var_to_set" "$STARTUP_RCCONF_MAP"
+	else
+		echo "$STARTUP_RCCONF_MAP"
+	fi
 
 	#
 	# Attempt to create the persistant global cache