From owner-svn-src-all@FreeBSD.ORG Sun Sep 23 17:47:01 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF959106566B; Sun, 23 Sep 2012 17:47:01 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA82B8FC14; Sun, 23 Sep 2012 17:47:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NHl14q046122; Sun, 23 Sep 2012 17:47:01 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NHl1cv046120; Sun, 23 Sep 2012 17:47:01 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201209231747.q8NHl1cv046120@svn.freebsd.org> From: Devin Teske Date: Sun, 23 Sep 2012 17:47:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240863 - head/usr.sbin/bsdconfig/share X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 17:47:01 -0000 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 #