summaryrefslogtreecommitdiff
path: root/distrib/aviion
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2015-05-04 19:55:28 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2015-05-04 19:55:28 +0000
commit673312bcd55905f9af8749487470081839359024 (patch)
treee64c20b577a936931851c64668bc45ec87938981 /distrib/aviion
parent57127e8f7bf0c20b654d8f2480b4ad30b81db45e (diff)
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/aviion')
-rw-r--r--distrib/aviion/ramdisk/install.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/distrib/aviion/ramdisk/install.md b/distrib/aviion/ramdisk/install.md
index f2e812d5a69..7e27e00c65c 100644
--- a/distrib/aviion/ramdisk/install.md
+++ b/distrib/aviion/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.5 2014/08/15 09:45:54 rpe Exp $
+# $OpenBSD: install.md,v 1.6 2015/05/04 19:55:26 rpe Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -114,6 +114,11 @@ __EOT
_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]:"