summaryrefslogtreecommitdiff
path: root/distrib/hppa
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2015-05-31 19:40:12 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2015-05-31 19:40:12 +0000
commit6f39b0ff9a313e2af7b93085787d409c1c1453e3 (patch)
tree3f7fde2797aade6486218968d307eaadf174251f /distrib/hppa
parentee8cc5a387b2b975f8d2ebd7d500640ba40558c7 (diff)
Replace identical code in the MD scripts of the installer with a new
MI function disklabel_autolayout() which now handles all aspects of the disklabel auto-layout and autopartitioning case for the root disk. Remove get_disklabel_template() and merge it with the new function. "move forward" deraadt@
Diffstat (limited to 'distrib/hppa')
-rw-r--r--distrib/hppa/install.md28
1 files changed, 5 insertions, 23 deletions
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 2e78018a008..96b5577caf7 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.28 2015/05/04 19:55:26 rpe Exp $
+# $OpenBSD: install.md,v 1.29 2015/05/31 19:40:10 rpe Exp $
#
# machine dependent section of installation/upgrade script.
#
@@ -17,31 +17,13 @@ md_installboot() {
}
md_prep_disklabel() {
- local _disk=$1 _f _op
+ local _disk=$1 _f=/tmp/fstab.$1
installboot $_disk
- _f=/tmp/fstab.$_disk
- if [[ $_disk == $ROOTDISK ]]; then
- if $AUTO && get_disklabel_template; then
- disklabel -T /disklabel.auto $FSTABFLAG $_f -w -A $_disk && return
- echo "Autopartitioning failed"
- exit 1
- fi
- while :; do
- echo "The auto-allocated layout for $_disk is:"
- disklabel -h -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 ;;
- e*|E*) _op=-E ;;
- c*|C*) break ;;
- *) continue ;;
- esac
- disklabel $FSTABFLAG $_f $_op -A $_disk
- return
- done
- fi
+ disklabel_autolayout $_disk $_f || return
+ [[ -s $_f ]] && return
+
cat <<__EOT
You will now create a OpenBSD disklabel on the disk. The disklabel defines
how OpenBSD splits up the disk into OpenBSD partitions in which filesystems