Where appropriate display the auto-allocation layout of the root

disk and ask if the installee wants to use it, edit it, or create
their own custom disklabel. Most one-disk installs will not need
to see fdisk or disklabel.

i386 and macppc by me, adapted for others by deraadt@.

ok deraadt@

1 files changed, 21 insertions, 4 deletions

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 3c6b573a4da..bdab1b27299 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.10 2008/06/26 05:42:03 ray Exp $
+#	$OpenBSD: install.md,v 1.11 2009/04/10 23:11:17 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -79,10 +79,28 @@ __EOT
 }
 
 md_prep_disklabel() {
-	local _disk=$1
+	local _disk=$1 _f _op
 
 	md_prep_fdisk $_disk
 
+	disklabel -W $_disk >/dev/null 2>&1
+	_f=/tmp/fstab.$_disk
+	if [[ $_disk == $ROOTDISK ]]; then
+		while :; do
+			echo "The auto-allocated layout for $_disk is:"
+			disklabel -f $_f -p g -A $_disk | grep "^  [a-p]:"
+			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
+			case $resp in
+			a*|A*)	_op=-w ; AUTOROOT=y ;;
+			e*|E*)	_op=-E ;;
+			c*|C*)	break ;;
+			*)	continue ;;
+			esac
+			disklabel -f $_f $_op -A $_disk
+			return
+		done
+	fi
+
 	cat <<__EOT
 
 You will now create an OpenBSD disklabel inside the OpenBSD MBR
@@ -94,8 +112,7 @@ start of the disk, NOT the start of the OpenBSD MBR partition.
 
 __EOT
 
-	disklabel -W $_disk >/dev/null 2>&1
-	disklabel -f /tmp/fstab.$_disk -E $_disk
+	disklabel -f $_f -E $_disk
 }
 
 md_congrats() {