Page MenuHomeFreeBSD
Files F143725722

D44671.diff
No OneTemporary
Actions

D44671.diff
View Options

diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -283,31 +283,35 @@
esac
fi
-PMODES="
- '$msg_auto_ufs' '$msg_auto_ufs_desc' '$msg_auto_ufs_help'
- '$msg_manual' '$msg_manual_desc' '$msg_manual_help'
- '$msg_shell' '$msg_shell_desc' '$msg_shell_help'
-" # END-QUOTE
-
-CURARCH=$( uname -m )
-case $CURARCH in
- amd64|arm64|i386|riscv) # Booting ZFS Supported
- PMODES="
- '$msg_auto_zfs' '$msg_auto_zfs_desc' '$msg_auto_zfs_help'
- $PMODES
- " # END-QUOTE
- ;;
- *) # Booting ZFS Unsupported
- ;;
-esac
+if [ "$BSDINSTALL_PARTMODE" ]; then
+ PARTMODE="$BSDINSTALL_PARTMODE"
+else
+ PMODES="
+ '$msg_auto_ufs' '$msg_auto_ufs_desc' '$msg_auto_ufs_help'
+ '$msg_manual' '$msg_manual_desc' '$msg_manual_help'
+ '$msg_shell' '$msg_shell_desc' '$msg_shell_help'
+ " # END-QUOTE
+
+ CURARCH=$( uname -m )
+ case $CURARCH in
+ amd64|arm64|i386|riscv) # Booting ZFS Supported
+ PMODES="
+ '$msg_auto_zfs' '$msg_auto_zfs_desc' '$msg_auto_zfs_help'
+ $PMODES
+ " # END-QUOTE
+ ;;
+ *) # Booting ZFS Unsupported
+ ;;
+ esac
-exec 5>&1
-PARTMODE=`echo $PMODES | xargs -o bsddialog --backtitle "$OSNAME Installer" \
- --title "Partitioning" \
- --item-help \
- --menu "How would you like to partition your disk?" \
- 0 0 0 2>&1 1>&5` || exit 1
-exec 5>&-
+ exec 5>&1
+ PARTMODE=`echo $PMODES | xargs -o bsddialog --backtitle "$OSNAME Installer" \
+ --title "Partitioning" \
+ --item-help \
+ --menu "How would you like to partition your disk?" \
+ 0 0 0 2>&1 1>&5` || exit 1
+ exec 5>&-
+fi
case "$PARTMODE" in
"$msg_auto_zfs") # ZFS

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 9:17 AM (14 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28329515
Default Alt Text
D44671.diff (1 KB)

Event Timeline