d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC revisions 271553, 271567:

Browse Source 
r271553: Rename choices in partitioning method dialog (nwhitehorn)
r271567: ZFS support isn't actually experimental anymore (nwhitehorn)

Approved by:	re (gjb)
This commit is contained in:
dteske 2014-09-27 01:50:03 +00:00
parent 786740ec0a
commit 48d7d19be1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/bsdinstall/scripts/auto
View File

@ -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"
;;