summaryrefslogtreecommitdiffstats
path: root/distrib/i386
diff options
context:
space:
mode:
authorrpe <rpe@openbsd.org>2015-05-04 19:55:26 +0000
committerrpe <rpe@openbsd.org>2015-05-04 19:55:26 +0000
commit12cba9fa7b097200b96c5b720c69521ecad03052 (patch)
treee23aa8a763f6905ca8c00ef31d1859b35c944a79 /distrib/i386
parentlightly document the posix option and POSIXLY_CORRECT; will sketch out (diff)
downloadwireguard-openbsd-12cba9fa7b097200b96c5b720c69521ecad03052.tar.xz
wireguard-openbsd-12cba9fa7b097200b96c5b720c69521ecad03052.zip
Add the new template file based autopartitioning feature of disklabel(8)
to the OpenBSD installer. It is available during unattended installation. The template file is fetched from an url, provided as answer to a new question in the response file: URL to autopartitioning template for disklabel = url Original diff from and OK henning@ 'no objection' krw@
Diffstat (limited to 'distrib/i386')
-rw-r--r--distrib/i386/common/install.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index f6599eeac7b..05c19423586 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.60 2015/01/12 16:33:31 deraadt Exp $
+# $OpenBSD: install.md,v 1.61 2015/05/04 19:55:26 rpe Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -98,6 +98,11 @@ md_prep_disklabel() {
_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]:"