summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-15 15:33:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-15 15:33:21 +0000
commitca477bfa49099abf658bae0d5b00d0fc84535ff8 (patch)
treee7e14ec092691b02235c5fe04b4dd233aff7f08c
parent98d9ef4ebea954237354f05151ebc389d3fabdac (diff)
go slightly back to the older behaviour by writing out a default disk label
only if 'i' is not found; by krw who is not around, looked at by drahn and otto and miod
-rw-r--r--distrib/macppc/ramdisk/install.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 0de83649f38..e65c56a3426 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.31 2007/05/24 13:17:26 krw Exp $
+# $OpenBSD: install.md,v 1.32 2007/08/15 15:33:20 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -82,7 +82,8 @@ __EOT
case $_resp in
m|mbr) export disklabeltype=MBR
md_prep_MBR $_disk || continue
- disklabel -w -d $_disk
+ disklabel $_disk 2>/dev/null | grep -q "^ i:" || \
+ disklabel -w -d $_disk
newfs -t msdos ${_disk}i
break
;;