summaryrefslogtreecommitdiff
path: root/distrib/amd64/common
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2016-02-08 17:28:10 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2016-02-08 17:28:10 +0000
commited8c11baee7f4f804d3cdf7cd535cbb897422052 (patch)
tree03402dc87c4c9820bdbe1ad0835ff6dfd2f95950 /distrib/amd64/common
parent8327c06f4eee4dd10165995a9f2e42070cdd1812 (diff)
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/amd64/common')
-rw-r--r--distrib/amd64/common/install.md16
1 files changed, 3 insertions, 13 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index da51aeb9bc7..2a1174e8952 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.50 2015/12/29 11:16:14 rpe Exp $
+# $OpenBSD: install.md,v 1.51 2016/02/08 17:28:08 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -144,18 +144,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
}