From owner-svn-src-all@freebsd.org  Mon Dec 12 19:10:40 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61D39C73199;
 Mon, 12 Dec 2016 19:10:40 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3022B1DD1;
 Mon, 12 Dec 2016 19:10:40 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBCJAdmZ081851;
 Mon, 12 Dec 2016 19:10:39 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBCJAdhr081850;
 Mon, 12 Dec 2016 19:10:39 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201612121910.uBCJAdhr081850@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 12 Dec 2016 19:10:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309926 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Dec 2016 19:10:40 -0000

Author: dteske
Date: Mon Dec 12 19:10:39 2016
New Revision: 309926
URL: https://svnweb.freebsd.org/changeset/base/309926

Log:
  Now that these variables do not contain the --default-item flag itself,
  change the name of the variable from $def_item_... to $default_...

Modified:
  head/usr.sbin/bsdinstall/scripts/wlanconfig

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Mon Dec 12 19:10:14 2016	(r309925)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Mon Dec 12 19:10:39 2016	(r309926)
@@ -81,8 +81,8 @@ dialog_country_select()
 {
 	local input regdomains countries regdomain country
 	local no_default="<not selected>"
-	local def_item_regdomain="${1:-$no_default}"
-	local def_item_country="${2:-$no_default}"
+	local default_regdomain="${1:-$no_default}"
+	local default_country="${2:-$no_default}"
 
 	#
 	# Parse available countries/regdomains
@@ -112,7 +112,7 @@ dialog_country_select()
 		--backtitle \"$DIALOG_BACKTITLE\" \
 		--title \"Regdomain selection\" \
 		--cancel-label \"Skip\" \
-		--default-item \"$def_item_regdomain\" \
+		--default-item \"$default_regdomain\" \
 		--no-items \
 		--stdout \
 		--menu \"Select your regdomain.\" \
@@ -126,7 +126,7 @@ dialog_country_select()
 		--backtitle \"$DIALOG_BACKTITLE\" \
 		--title \"Country selection\" \
 		--cancel-label \"Skip\" \
-		--default-item \"$def_item_country\" \
+		--default-item \"$default_country\" \
 		--stdout \
 		--menu \"Select your country.\" \
 		$height $width $rows $countries"