Invoke pdisk, not disklabel, on disks with MacOS partition information.

ok krw@

1 files changed, 12 insertions, 11 deletions

diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 8cb7f4c1c8c..cedfb2f3c64 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.21 2003/10/12 13:18:37 krw Exp $
+#       $OpenBSD: install.md,v 1.22 2004/12/03 06:30:00 miod Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -92,23 +92,24 @@ md_checkfordisklabel() {
 }
 
 md_prep_disklabel() {
-	local _disk=$1 _wflag="-W"
+	local _disk=$1
 
 	md_checkfordisklabel $_disk
 	case $? in
-	2)	echo "WARNING: Label on disk $_disk is corrupted. You will be repairing it.\n"
-		;;
 	3)	cat <<__EOT
-WARNING: This disk has been set up under Mac OS. For safety reasons, you
-	 will not be allowed to save any disklabel changes from OpenBSD.
-
+This disk has been setup under MacOS. You will now edit a MacOS partition
+table. Be careful not to remove the MacOS partitions in use.
 __EOT
-		_wflag="-N"
+		pdisk /dev/${_disk}c
+		;;
+	*)	cat <<__EOT
+This disk is not shared with MacOS. You will now edit a regular OpenBSD
+disklabel.
+__EOT
+		disklabel -W $_disk >/dev/null 2>&1
+		disklabel -f /tmp/fstab.$_disk -E $_disk
 		;;
 	esac
-
-	disklabel $_wflag $_disk >/dev/null 2>&1
-	disklabel -f /tmp/fstab.$_disk -E $_disk
 }
 
 md_congrats() {