summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-06-08 21:33:09 +0000
committerdteske <dteske@FreeBSD.org>2013-06-08 21:33:09 +0000
commitcf6da5ffd10b0bbe5a90f0f4856fbe82b6d25e41 (patch)
tree61e2dec440d38207e442ead4f075324b3ef25fd4 /usr.sbin
parent7d8e34db148d7c34fb4fae5c58457b2b318a5882 (diff)
downloadFreeBSD-src-cf6da5ffd10b0bbe5a90f0f4856fbe82b6d25e41.zip
FreeBSD-src-cf6da5ffd10b0bbe5a90f0f4856fbe82b6d25e41.tar.gz
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.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bsdconfig/startup/share/rcconf.subr6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr
index 744bccc..07a9de2 100644
--- a/usr.sbin/bsdconfig/startup/share/rcconf.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr
@@ -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
OpenPOWER on IntegriCloud