summaryrefslogtreecommitdiffstats
path: root/distrib/i386/common
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-02-08 17:28:08 +0000
committerkrw <krw@openbsd.org>2016-02-08 17:28:08 +0000
commitc375c99c1c4fd8d2bf07d762b512d4ec3fbf190c (patch)
tree095991a19065d3bb443bc27ff2ebad6580cd6073 /distrib/i386/common
parentConvert to uiomove. From Martin Natano. (diff)
downloadwireguard-openbsd-c375c99c1c4fd8d2bf07d762b512d4ec3fbf190c.tar.xz
wireguard-openbsd-c375c99c1c4fd8d2bf07d762b512d4ec3fbf190c.zip
If manual disklabel editing is requested during install, don't emit
verbiage explaining what disklabels are. If you don't know, you should be using (A)uto! ok rpe@ halex@
Diffstat (limited to 'distrib/i386/common')
-rw-r--r--distrib/i386/common/install.md16
1 files changed, 3 insertions, 13 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index ee6339529e1..dd9e9066d17 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.69 2015/12/29 11:16:14 rpe Exp $
+# $OpenBSD: install.md,v 1.70 2016/02/08 17:28:08 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -96,18 +96,8 @@ md_prep_disklabel() {
disklabel_autolayout $_disk $_f || return
[[ -s $_f ]] && return
- cat <<__EOT
-
-You will now create an OpenBSD disklabel inside the OpenBSD MBR
-partition. The disklabel defines how OpenBSD splits up the MBR partition
-into OpenBSD partitions in which filesystems and swap space are created.
-You must provide each filesystem's mountpoint in this program.
-
-The offsets used in the disklabel are ABSOLUTE, i.e. relative to the
-start of the disk, NOT the start of the OpenBSD MBR partition.
-
-__EOT
-
+ # Edit disklabel manually.
+ # Abandon all hope, ye who enter here.
disklabel -F $_f -E $_disk
}