svn commit: r251613 - in head/usr.sbin/bsdconfig/share: . media

[Devin Teske]

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"