Author: dteske
Date: Sun Sep 23 17:47:01 2012
New Revision: 240863
URL: http://svn.freebsd.org/changeset/base/240863
Log:
Always use RC_CONFS when set, even if NULL. Previously only used if non-NULL.
Reviewed by: jilles, adrian (co-mentor)
Approved by: adrian (co-mentor)
Modified:
head/usr.sbin/bsdconfig/share/sysrc.subr
Modified: head/usr.sbin/bsdconfig/share/sysrc.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/sysrc.subr Sun Sep 23 17:42:39 2012
(r240862)
+++ head/usr.sbin/bsdconfig/share/sysrc.subr Sun Sep 23 17:47:01 2012
(r240863)
@@ -256,7 +256,7 @@ f_sysrc_find()
# If RC_CONFS is defined, set $rc_conf_files to an explicit
# value, modifying the default behavior of source_rc_confs().
#
- [ "$RC_CONFS" ] && rc_conf_files="$RC_CONFS"
+ [ "${RC_CONFS+set}" ] && rc_conf_files="$RC_CONFS"
#
# Reverse the order of files in rc_conf_files (the boot process sources
@@ -435,7 +435,7 @@ f_sysrc_set()
# If RC_CONFS is defined, use $RC_CONFS
# rather than $rc_conf_files.
#
- if [ "$RC_CONFS" ]; then
+ if [ "${RC_CONFS+set}" ]; then
file="${RC_CONFS%%[$IFS]*}"
else
file=$( f_sysrc_get rc_conf_files )
@@ -554,7 +554,7 @@ f_sysrc_delete()
#
# Operate on each of the specified files
#
- for file in ${RC_CONFS:-$( f_sysrc_get rc_conf_files )}; do
+ for file in ${RC_CONFS-$( f_sysrc_get rc_conf_files )}; do
[ -e "$file" ] || continue
#
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
