From owner-svn-src-head@FreeBSD.ORG Sun Jun 2 22:54:37 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C2ABAB50; Sun, 2 Jun 2013 22:54:37 +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 9C06F1C0B; Sun, 2 Jun 2013 22:54:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52Msb6Q085190; Sun, 2 Jun 2013 22:54:37 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52Msbl3085187; Sun, 2 Jun 2013 22:54:37 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306022254.r52Msbl3085187@svn.freebsd.org> From: Devin Teske Date: Sun, 2 Jun 2013 22:54:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251268 - in head/usr.sbin/bsdconfig/share: media packages 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 22:54:37 -0000 Author: dteske Date: Sun Jun 2 22:54:36 2013 New Revision: 251268 URL: http://svnweb.freebsd.org/changeset/base/251268 Log: Use f_isset() (introduced by r250317) instead of `f_quietly f_getvar ...'. Modified: head/usr.sbin/bsdconfig/share/media/nfs.subr head/usr.sbin/bsdconfig/share/media/tcpip.subr head/usr.sbin/bsdconfig/share/packages/categories.subr Modified: head/usr.sbin/bsdconfig/share/media/nfs.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/media/nfs.subr Sun Jun 2 22:45:54 2013 (r251267) +++ head/usr.sbin/bsdconfig/share/media/nfs.subr Sun Jun 2 22:54:36 2013 (r251268) @@ -103,9 +103,8 @@ f_media_set_nfs() f_dprintf "%s: $msg_net_device_init_failed\n" f_media_set_nfs local hostname="${nfs%%:*}" - if f_quietly f_getvar $VAR_NAMESERVER && ! { - f_validate_ipaddr "$hostname" || - f_validate_ipaddr6 "$hostname" + if f_isset $VAR_NAMESERVER && ! { + f_validate_ipaddr "$hostname" || f_validate_ipaddr6 "$hostname" }; then f_show_info "$msg_looking_up_host" "$hostname" f_dprintf "%s Looking up hostname, %s, using host(1)" \ Modified: head/usr.sbin/bsdconfig/share/media/tcpip.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/media/tcpip.subr Sun Jun 2 22:45:54 2013 (r251267) +++ head/usr.sbin/bsdconfig/share/media/tcpip.subr Sun Jun 2 22:54:36 2013 (r251268) @@ -1133,11 +1133,12 @@ f_device_dialog_tcp() # Otherwise, ask the question interactively. # local try6 - if ! f_quietly f_getvar $VAR_NO_INET6 && { + if ! f_isset $VAR_NO_INET6 && { { f_getvar $VAR_TRY_RTSOL try6 && [ "$try6" = "YES" ]; } || { - ! f_quietly f_getvar $VAR_TRY_RTSOL && - f_dialog_noyes "$msg_try_ipv6_configuration" + # Only prompt the user when VAR_TRY_RTSOL is unset + ! f_isset $VAR_TRY_RTSOL && + f_dialog_noyes "$msg_try_ipv6_configuration" } }; then local i @@ -1169,8 +1170,9 @@ f_device_dialog_tcp() # local try4 if { f_getvar $VAR_TRY_DHCP try4 && [ "$try4" = "YES" ]; } || { - ! f_quietly f_getvar $VAR_TRY_DHCP && - f_dialog_noyes "$msg_try_dhcp_configuration" + # Only prompt the user when VAR_TRY_DHCP is unset + ! f_isset $VAR_TRY_DHCP && + f_dialog_noyes "$msg_try_dhcp_configuration" }; then f_quietly ifconfig $dev delete f_quietly mkdir -p /var/db Modified: head/usr.sbin/bsdconfig/share/packages/categories.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/packages/categories.subr Sun Jun 2 22:45:54 2013 (r251267) +++ head/usr.sbin/bsdconfig/share/packages/categories.subr Sun Jun 2 22:54:36 2013 (r251268) @@ -83,7 +83,7 @@ f_category_desc_set() for cat in $CATEGORIES; do [ "$cat" = "$category" ] || continue f_str2varname $cat varcat - f_quietly f_getvar _category_$varcat || continue + f_isset _category_$varcat || continue found=1 && break done if [ ! "$found" ]; then