diff options
author | dteske <dteske@FreeBSD.org> | 2014-09-27 01:50:03 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2014-09-27 01:50:03 +0000 |
commit | 48d7d19be1032963ba598acf23049528a50200bc (patch) | |
tree | 829bf5cdf440dd0bf25d48851837b442dcb068bf /usr.sbin/bsdinstall | |
parent | 786740ec0a6b6304a2be2aa662715d20352cdc45 (diff) | |
download | FreeBSD-src-48d7d19be1032963ba598acf23049528a50200bc.zip FreeBSD-src-48d7d19be1032963ba598acf23049528a50200bc.tar.gz |
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)
Diffstat (limited to 'usr.sbin/bsdinstall')
-rwxr-xr-x | usr.sbin/bsdinstall/scripts/auto | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 552bb07..433744e 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -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 --backtitle "FreeBSD Installer" \ 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" ;; |