Author: nwhitehorn
Date: Sat Sep 13 22:14:19 2014
New Revision: 271553
URL: http://svnweb.freebsd.org/changeset/base/271553
Log:
Rename the choices in the partitioning methods dialog to reflect current
reality. In particular, draw a connection between the auto ZFS script and
the auto UFS one, since they fulfill similar functions. I'm not sure the
auto ZFS code is actually experimental anymore, so it might be worth
changing that label still.
Modified:
head/usr.sbin/bsdinstall/scripts/auto
Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto Sat Sep 13 22:03:51 2014
(r271552)
+++ head/usr.sbin/bsdinstall/scripts/auto Sat Sep 13 22:14:19 2014
(r271553)
@@ -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
(Experimental)\""
;;
*) # 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"
;;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
