diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-04-10 23:11:18 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-04-10 23:11:18 +0000 |
| commit | 664b5db5ab97bf86e785bf264ffbb25ce4e39488 (patch) | |
| tree | b4add2cf99648fb8a6bbcb784ad539ea86cff3b0 /distrib/alpha | |
| parent | 02f596d16fd8670c56e195ef0393b82a09b3e9dc (diff) | |
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@
Diffstat (limited to 'distrib/alpha')
| -rw-r--r-- | distrib/alpha/common/install.md | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index 432090715d9..a730d0aea0c 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.24 2008/06/26 05:42:03 ray Exp $ +# $OpenBSD: install.md,v 1.25 2009/04/10 23:11:17 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -50,10 +50,26 @@ md_installboot() { } md_prep_disklabel() { - local _disk=$1 + local _disk=$1 _f _op disklabel -W $_disk >/dev/null 2>&1 - disklabel -f /tmp/fstab.$_disk -E $_disk + _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 | egrep "^#|^ [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 + disklabel -f $_f -E $_disk } md_congrats() { |