summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2009-05-30 21:57:17 +0000
committerkrw <krw@openbsd.org>2009-05-30 21:57:17 +0000
commit6022b9b3948ab4b66f4c9045a30cff19e49c39cc (patch)
treebfd3296ad02e708960b59a4da731e0b7b8b2b719
parentBring up raid sets that have missing memebers. (diff)
downloadwireguard-openbsd-6022b9b3948ab4b66f4c9045a30cff19e49c39cc.tar.xz
wireguard-openbsd-6022b9b3948ab4b66f4c9045a30cff19e49c39cc.zip
Even HFS installs need to run disklabel(8)! Revert erroroneous
bypassing of disklabel(8) invocation. Noticed by and fix ok maja@
-rw-r--r--distrib/macppc/ramdisk/install.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 02a0b3f0b59..e475e3d95a5 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.40 2009/04/24 01:43:27 krw Exp $
+# $OpenBSD: install.md,v 1.41 2009/05/30 21:57:17 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -153,12 +153,8 @@ md_prep_disklabel() {
md_prep_disk $_disk
case $disklabeltype in
- HFS) return ;;
- MBR) ;;
- *) echo "$_disk has no HFS or MBR partition table." ; exit ;;
- esac
-
- cat <<__EOT
+ HFS) ;;
+ MBR) cat <<__EOT
You *MUST* setup the OpenBSD disklabel to include the MSDOS-formatted boot
partition as the 'i' partition. If the 'i' partition is missing or not the
@@ -166,6 +162,9 @@ MSDOS-formatted boot partition, then the 'ofwboot' file required to boot
OpenBSD cannot be installed.
__EOT
+ ;;
+ *) echo "$_disk has no HFS or MBR partition table." ; exit ;;
+ esac
disklabel -W $_disk >/dev/null 2>&1
_f=/tmp/fstab.$_disk