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

Rename the choices in the partitioning methods dialog to reflect current

Browse Source 
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.
This commit is contained in:
nwhitehorn 2014-09-13 22:14:19 +00:00
parent 7d7cd42c1e
commit 7d76d60b0e
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 (Experimental)\""
;;
*) # 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"
;;