From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 03:37:29 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CCA3D54E;
 Tue, 11 Jun 2013 03:37:29 +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 BEE2918B3;
 Tue, 11 Jun 2013 03:37:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5B3bTS9055799;
 Tue, 11 Jun 2013 03:37:29 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5B3bTDV055796;
 Tue, 11 Jun 2013 03:37:29 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306110337.r5B3bTDV055796@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 11 Jun 2013 03:37:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251613 - in head/usr.sbin/bsdconfig/share: . media
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jun 2013 03:37:29 -0000

Author: dteske
Date: Tue Jun 11 03:37:29 2013
New Revision: 251613
URL: http://svnweb.freebsd.org/changeset/base/251613

Log:
  Make the default choice for FTP media access use "auto".

Modified:
  head/usr.sbin/bsdconfig/share/media/any.subr
  head/usr.sbin/bsdconfig/share/variable.subr

Modified: head/usr.sbin/bsdconfig/share/media/any.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/any.subr	Tue Jun 11 02:47:07 2013	(r251612)
+++ head/usr.sbin/bsdconfig/share/media/any.subr	Tue Jun 11 03:37:29 2013	(r251613)
@@ -122,7 +122,7 @@ f_media_get_type()
 
 		case "$mtag" in
 		?" $msg_cd_dvd")      f_media_set_cdrom ;;
-		?" $msg_ftp")         f_media_set_ftp_active ;;
+		?" $msg_ftp")         f_media_set_ftp ;;
 		?" $msg_ftp_passive") f_media_set_ftp_passive ;;
 		?" $msg_http")        f_media_set_http_proxy ;;
 		?" $msg_directory")   f_media_set_directory ;;

Modified: head/usr.sbin/bsdconfig/share/variable.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/variable.subr	Tue Jun 11 02:47:07 2013	(r251612)
+++ head/usr.sbin/bsdconfig/share/variable.subr	Tue Jun 11 03:37:29 2013	(r251613)
@@ -110,7 +110,7 @@ f_variable_set_defaults()
 	# Initialize various user-edittable values to their defaults
 	#
 	setvar $VAR_EDITOR		"${EDITOR:-/usr/bin/ee}"
-	setvar $VAR_FTP_STATE		"passive"
+	setvar $VAR_FTP_STATE		"auto"
 	setvar $VAR_FTP_USER		"ftp"
 	setvar $VAR_HOSTNAME		"$( hostname )"
 	setvar $VAR_MEDIA_TIMEOUT	"300"