Date: Sun, 2 Jun 2013 22:54:37 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> 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 Message-ID: <201306022254.r52Msbl3085187@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306022254.r52Msbl3085187>