Index: usr.sbin/bsdinstall/scripts/auto =================================================================== --- usr.sbin/bsdinstall/scripts/auto +++ usr.sbin/bsdinstall/scripts/auto @@ -49,6 +49,18 @@ msg_no="NO" msg_restart="Restart" msg_yes="YES" +msg_partitioning_zfs="Auto (ZFS)" +msg_partitioning_zfs_desc="Guided Root-on-ZFS" +msg_partitioning_zfs_help="ZFS is recommended if you have at least 4GB RAM" +msg_partitioning_ufs="Auto (UFS)" +msg_partitioning_ufs_desc="Guided Disk Setup" +msg_partitioning_ufs_help="UFS is recommended if you have less than 4GB of RAM" +msg_partitioning_manual="Manual" +msg_partitioning_manual_desc="Manual Disk Setup (experts)" +msg_partitioning_manual_help="Create customized partitions from menu options" +msg_partitioning_shell="Shell" +msg_partitioning_shell_desc="Open a shell and partition by hand" +msg_partitioning_shell_help="Create customized partitions using command-line utilities" ############################################################ FUNCTIONS @@ -281,23 +293,28 @@ esac fi -PMODES="\ -\"Auto (UFS)\" \"Guided Disk Setup\" \ -Manual \"Manual Disk Setup (experts)\" \ -Shell \"Open a shell and partition by hand\"" +PMODES=" + '$msg_partitioning_ufs' '$msg_partitioning_ufs_desc' '$msg_partitioning_ufs_help' + '$msg_partitioning_manual' '$msg_partitioning_manual_desc' '$msg_partitioning_manual_help' + '$msg_partitioning_shell' '$msg_partitioning_shell_desc' '$msg_partitioning_shell_help' +" # END-QUOTE CURARCH=$( uname -m ) case $CURARCH in amd64|arm64|i386) # Booting ZFS Supported - PMODES="\"Auto (ZFS)\" \"Guided Root-on-ZFS\" $PMODES" + PMODES=" + '$msg_partitioning_zfs' '$msg_partitioning_zfs_desc' '$msg_partitioning_zfs_help' + $PMODES + " # END-QUOTE ;; - *) # Booting ZFS Unspported + *) # Booting ZFS Unsupported ;; esac exec 3>&1 PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \ --title "Partitioning" \ + --item-help \ --menu "How would you like to partition your disk?" \ 0 0 0 2>&1 1>&3` || exit 1 exec 3>&-