summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-30 17:52:52 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-30 17:52:52 +0000
commit9b5e4d74ac47423be76e44cc8b146e398905bc65 (patch)
tree8b3c2f7b184080ada68674070c38cdf49786bbde /distrib
parent1cd18a365273455a112a9b3091d3f856e558871d (diff)
use new fdisk & disklabel
Diffstat (limited to 'distrib')
-rw-r--r--distrib/alpha/ramdisk/install.md4
-rw-r--r--distrib/arc/ramdisk/install.md6
-rw-r--r--distrib/hp300/ramdisk/install.md10
-rw-r--r--distrib/i386/floppies/ramdisk/install.md6
-rw-r--r--distrib/mvme68k/ramdisk/install.md4
-rw-r--r--distrib/pmax/install.md4
-rw-r--r--distrib/powerpc/miniroot/install.md4
-rw-r--r--distrib/sparc/install.md4
-rw-r--r--distrib/sun3/common/install.sh6
9 files changed, 24 insertions, 24 deletions
diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/ramdisk/install.md
index 8995483c142..549180b37db 100644
--- a/distrib/alpha/ramdisk/install.md
+++ b/distrib/alpha/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.10 1997/07/31 17:10:14 millert Exp $
+# $OpenBSD: install.md,v 1.11 1997/09/30 17:52:35 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -202,7 +202,7 @@ __md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
disklabel -W ${_disk}
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_welcome_banner() {
diff --git a/distrib/arc/ramdisk/install.md b/distrib/arc/ramdisk/install.md
index 261b3c02d16..791ae88424a 100644
--- a/distrib/arc/ramdisk/install.md
+++ b/distrib/arc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.5 1997/05/19 22:19:58 pefo Exp $
+# $OpenBSD: install.md,v 1.6 1997/09/30 17:52:38 deraadt Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -225,7 +225,7 @@ __md_prep_fdisk_1
echo -n "Press [Enter] to continue "
getresp ""
- fdisk -u ${_disk}
+ fdisk -e ${_disk}
echo
echo "The new partition information is:"
@@ -313,7 +313,7 @@ __md_prep_disklabel_1
disklabel ${_disk} >/tmp/label.$$
disklabel -r -R ${_disk} /tmp/label.$$
rm -f /tmp/label.$$
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_copy_kernel() {
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index dbe99ad8604..e116fcffcff 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: install.md,v 1.5 1997/05/14 21:39:12 millert Exp $
+# $OpenBSD: install.md,v 1.6 1997/09/30 17:52:41 deraadt Exp $
# $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -279,7 +279,7 @@ __scsi_label_1
getresp ""
disklabel -W ${1}
- if ! disklabel -r -e /dev/r${1}a; then
+ if ! disklabel -r -E /dev/r${1}a; then
echo ""
echo "ERROR: can't fixup geometry!"
rval="1"
@@ -375,7 +375,7 @@ md_labeldisk() {
0)
# Go ahead and just edit the disklabel.
disklabel -W $1
- disklabel -r -e $1
+ disklabel -r -E $1
;;
*)
@@ -410,7 +410,7 @@ md_labeldisk() {
# We have some defaults installed. Pop into
# the disklabel editor.
disklabel -W $1
- if ! disklabel -r -e $1; then
+ if ! disklabel -r -E $1; then
echo ""
echo "ERROR: couldn't set partition map for $1"
echo ""
@@ -471,7 +471,7 @@ __md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
disklabel -W ${_disk}
- disklabel -r -e ${_disk}
+ disklabel -r -E ${_disk}
}
md_copy_kernel() {
diff --git a/distrib/i386/floppies/ramdisk/install.md b/distrib/i386/floppies/ramdisk/install.md
index a9d10f8e7ac..de0b69f84eb 100644
--- a/distrib/i386/floppies/ramdisk/install.md
+++ b/distrib/i386/floppies/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.15 1997/09/26 19:51:12 deraadt Exp $
+# $OpenBSD: install.md,v 1.16 1997/09/30 17:52:42 deraadt Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -151,7 +151,7 @@ __md_prep_fdisk_1
echo -n "Press [Enter] to continue "
getresp ""
- fdisk -u ${_disk}
+ fdisk -e ${_disk}
echo
echo "The new partition information is:"
@@ -232,7 +232,7 @@ __md_prep_disklabel_1
disklabel ${_disk} >/tmp/label.$$
disklabel -r -R ${_disk} /tmp/label.$$
rm -f /tmp/label.$$
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_copy_kernel() {
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index d793f5b397b..8995d97d1d7 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.4 1997/05/14 21:39:16 millert Exp $
+# $OpenBSD: install.md,v 1.5 1997/09/30 17:52:44 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -155,7 +155,7 @@ __md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
disklabel -W ${_disk}
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_welcome_banner() {
diff --git a/distrib/pmax/install.md b/distrib/pmax/install.md
index 37139914cfd..a3b1a822893 100644
--- a/distrib/pmax/install.md
+++ b/distrib/pmax/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.4 1997/05/15 12:31:11 graichen Exp $
+# $OpenBSD: install.md,v 1.5 1997/09/30 17:52:46 deraadt Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -241,7 +241,7 @@ __md_prep_disklabel_1
# TTT hack to workaround disklabel problems
disklabel ${_disk} > /tmp/tempdisklabel
disklabel -r -R ${_disk} /tmp/tempdisklabel 2> /dev/null
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
# TTT hack to workaround disklabel problems
disklabel ${_disk} > /tmp/tempdisklabel
disklabel -r -R ${_disk} /tmp/tempdisklabel 2> /dev/null
diff --git a/distrib/powerpc/miniroot/install.md b/distrib/powerpc/miniroot/install.md
index 6368f2383ec..346865d4c1f 100644
--- a/distrib/powerpc/miniroot/install.md
+++ b/distrib/powerpc/miniroot/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.4 1997/05/14 21:39:17 millert Exp $
+# $OpenBSD: install.md,v 1.5 1997/09/30 17:52:47 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -187,7 +187,7 @@ __md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
disklabel -W ${_disk}
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_welcome_banner() {
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index b079ccfea52..a9c2907e854 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.13 1997/05/29 08:38:57 grr Exp $
+# $OpenBSD: install.md,v 1.14 1997/09/30 17:52:49 deraadt Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -217,7 +217,7 @@ __md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
disklabel -W ${_disk}
- disklabel -e ${_disk}
+ disklabel -E ${_disk}
}
md_copy_kernel() {
diff --git a/distrib/sun3/common/install.sh b/distrib/sun3/common/install.sh
index fa72839d4d1..a15c0142056 100644
--- a/distrib/sun3/common/install.sh
+++ b/distrib/sun3/common/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.5 1996/06/29 05:54:26 tholo Exp $
+# $OpenBSD: install.sh,v 1.6 1997/09/30 17:52:51 deraadt Exp $
# $NetBSD: install.sh,v 1.5 1996/02/28 00:52:38 thorpej Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -147,7 +147,7 @@ md_checkfordisklabel() {
md_labeldisk() {
# $1 is the disk to label
- disklabel -e $1
+ disklabel -E $1
}
# Note, while they might not seem machine-dependent, the
@@ -777,7 +777,7 @@ echo -n "Do you wish to edit the root disklabel? [y] "
getresp "y"
case "$resp" in
y*|Y*)
- disklabel -e ${ROOTDISK}
+ disklabel -E ${ROOTDISK}
;;
*)