27c27
< # $FreeBSD: head/usr.sbin/bsdinstall/scripts/auto 256338 2013-10-11 20:21:44Z des $
---
> # $FreeBSD: head/usr.sbin/bsdinstall/scripts/auto 256343 2013-10-11 20:41:35Z dteske $
96,98c96,99
< dialog --backtitle "FreeBSD Installer" --title "Partitioning" --extra-button \
< --extra-label "Manual" --ok-label "Guided" --cancel-label "Shell" \
< --yesno "Would you like to use the guided partitioning tool (recommended for beginners) or to set up partitions manually (experts)? You can also open a shell and set up partitions entirely by hand." 0 0
---
> PMODES="\
> Guided \"Partitioning Tool (Recommended for Beginners)\" \
> Manual \"Manually Configure Partitions (Expert)\" \
> Shell \"Open a shell and partition by hand\""
100,101c101,119
< case $? in
< 0) # Guided
---
> CURARCH=$( uname -m )
> case $CURARCH in
> amd64|i386) # Booting ZFS Supported
> PMODES="$PMODES ZFS \"Automatic Root-on-ZFS (Experimental)\""
> ;;
> *) # Booting ZFS Unspported
> ;;
> esac
>
> exec 3>&1
> PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
> --title "Partitioning" \
> --menu "How would you like to partition your disk?" \
> 0 0 0 2>&1 1>&3`
> if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
> exec 3>&-
>
> case "$PARTMODE" in
> "Guided") # Guided
105c123
< 1) # Shell
---
> "Shell") # Shell
110c128
< 3) # Manual
---
> "Manual") # Manual
113a132,135
> "ZFS") # ZFS
> bsdinstall zfsboot || error
> bsdinstall mount || error
> ;;