diff options
| author | dteske <dteske@FreeBSD.org> | 2012-09-23 17:47:01 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2012-09-23 17:47:01 +0000 |
| commit | 5a93cdb01d93f68e285ed90869a2197c2511f36c (patch) | |
| tree | a267afb1d524baebd804f239b541e36f15d02528 | |
| parent | a0349df30f698fa26694aeca2cf25e3745801b81 (diff) | |
| download | FreeBSD-src-5a93cdb01d93f68e285ed90869a2197c2511f36c.zip FreeBSD-src-5a93cdb01d93f68e285ed90869a2197c2511f36c.tar.gz | |
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)
| -rw-r--r-- | usr.sbin/bsdconfig/share/sysrc.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr index 51aabcc..dc231d4 100644 --- a/usr.sbin/bsdconfig/share/sysrc.subr +++ b/usr.sbin/bsdconfig/share/sysrc.subr @@ -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 # |
