Page MenuHomeFreeBSD
Files F148356117

D23224.id67273.diff
No OneTemporary
Actions

D23224.id67273.diff
View Options

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="To use ZFS with less than 8GB RAM, see https://wiki.freebsd.org/ZFSTuningGuide"
+msg_partitioning_ufs="Auto (UFS)"
+msg_partitioning_ufs_desc="Guided Disk Setup"
+msg_partitioning_ufs_help="Menu options help choose which disk to setup using UFS and standard partitions"
+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,42 +293,47 @@
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>&-
case "$PARTMODE" in
-"Auto (ZFS)") # ZFS
+"$msg_partitioning_zfs") # ZFS
bsdinstall zfsboot || error "ZFS setup failed"
bsdinstall mount || error "Failed to mount filesystem"
;;
-"Auto (UFS)") # Guided
+"$msg_partitioning_ufs") # Guided
bsdinstall autopart || error "Partitioning error"
bsdinstall mount || error "Failed to mount filesystem"
;;
-"Shell") # Shell
+"$msg_partitioning_shell") # Shell
clear
echo "Use this shell to set up partitions for the new system. When finished, mount the system at $BSDINSTALL_CHROOT and place an fstab file for the new system at $PATH_FSTAB. Then type 'exit'. You can also enter the partition editor at any time by entering 'bsdinstall partedit'."
sh 2>&1
;;
-"Manual") # Manual
+"$msg_partitioning_manual") # Manual
if f_isset debugFile; then
# Give partedit the path to our logfile so it can append
BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error "Partitioning error"

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 8:16 AM (11 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29893561
Default Alt Text
D23224.id67273.diff (2 KB)

Event Timeline