svn commit: r272194 - stable/10/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Sat Sep 27 01:50:03 2014
New Revision: 272194
URL: http://svnweb.freebsd.org/changeset/base/272194

Log:
  MFC revisions 271553, 271567:
  r271553: Rename choices in partitioning method dialog (nwhitehorn)
  r271567: ZFS support isn't actually experimental anymore (nwhitehorn)
  
  Approved by:	re (gjb)

Modified:
  stable/10/usr.sbin/bsdinstall/scripts/auto
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/auto	Sat Sep 27 01:15:24 2014	(r272193)
+++ stable/10/usr.sbin/bsdinstall/scripts/auto	Sat Sep 27 01:50:03 2014	(r272194)
@@ -107,14 +107,14 @@ rm -f $PATH_FSTAB
 touch $PATH_FSTAB
 
 PMODES="\
-Guided \"Partitioning Tool (Recommended for Beginners)\" \
-Manual \"Manually Configure Partitions (Expert)\" \
+\"Auto (UFS)\" \"Guided Disk Setup\" \
+Manual \"Manual Disk Setup (experts)\" \
 Shell \"Open a shell and partition by hand\""
 
 CURARCH=$( uname -m )
 case $CURARCH in
 	amd64|i386)	# Booting ZFS Supported
-		PMODES="$PMODES ZFS \"Automatic Root-on-ZFS (Experimental)\""
+		PMODES="$PMODES \"Auto (ZFS)\" \"Guided Root-on-ZFS\""
 		;;
 	*)		# Booting ZFS Unspported
 		;;
@@ -128,7 +128,7 @@ PARTMODE=`echo $PMODES | xargs dialog --
 exec 3>&-
 
 case "$PARTMODE" in
-"Guided")	# Guided
+"Auto (UFS)")	# Guided
 	bsdinstall autopart || error "Partitioning error"
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;
@@ -146,7 +146,7 @@ case "$PARTMODE" in
 	fi
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;
-"ZFS")	# ZFS
+"Auto (ZFS)")	# ZFS
 	bsdinstall zfsboot || error "ZFS setup failed"
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;