summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/alpha/common/install.md8
-rw-r--r--distrib/amd64/common/install.md4
-rw-r--r--distrib/hp300/ramdisk/install.md4
-rw-r--r--distrib/hppa/install.md4
-rw-r--r--distrib/i386/common/install.md4
-rw-r--r--distrib/landisk/ramdisk/install.md4
-rw-r--r--distrib/macppc/ramdisk/install.md7
-rw-r--r--distrib/mvme68k/ramdisk/install.md4
-rw-r--r--distrib/mvme88k/ramdisk/install.md4
-rw-r--r--distrib/sparc/install.md6
-rw-r--r--distrib/sparc64/common/install.md23
11 files changed, 27 insertions, 45 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index f18b2c6180a..316e7598e29 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.28 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.29 2009/05/31 17:49:53 deraadt Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,12 +40,10 @@ md_installboot() {
# use extracted mdec if it exists (may be newer)
if [ -d /mnt/usr/mdec ]; then
cp /mnt/usr/mdec/boot /mnt/boot
- /mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx $_rawdev
+ /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx $_rawdev
elif [ -d /usr/mdec ]; then
cp /usr/mdec/boot /mnt/boot
- /usr/mdec/installboot -v /mnt/boot /usr/mdec/bootxx $_rawdev
- else
- echo No boot block prototypes found, you must run installboot manually.
+ /usr/mdec/installboot /mnt/boot /usr/mdec/bootxx $_rawdev
fi
}
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 8064ee31dc9..df66aca7a94 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.19 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.20 2009/05/31 17:49:53 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@ md_installboot() {
fi
cp /usr/mdec/boot /mnt/boot
- /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1}
+ /usr/mdec/installboot /mnt/boot /usr/mdec/biosboot ${1}
}
md_prep_fdisk() {
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 3504cf8754e..a32e9817ba1 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.51 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.52 2009/05/31 17:49:53 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.
@@ -36,8 +36,6 @@ ARCH=ARCH
MDDKDEVS="/^[hs]d[0-9][0-9]* /s/ .*//p"
md_installboot() {
- # $1 is the root disk
-
disklabel -B ${1}
}
diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index c5564ef15a0..262c9ca9344 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.12 2009/05/11 17:13:05 deraadt Exp $
+# $OpenBSD: install.md,v 1.13 2009/05/31 17:49:53 deraadt Exp $
#
# machine dependent section of installation/upgrade script.
#
@@ -7,9 +7,7 @@ MDTERM=vt100
ARCH=ARCH
md_installboot() {
- echo -n "Installing boot block..."
/sbin/disklabel -B $1
- echo "done."
}
md_prep_disklabel() {
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 1c6b066fce8..c5e57356031 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.42 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.43 2009/05/31 17:49:53 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@ md_installboot() {
# LBA biosboot uses /boot's i-node number. Using 'cat' preserves that
# number, so multiboot setups (NTLDR) can work across upgrades.
cat /usr/mdec/boot >/mnt/boot
- /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1}
+ /usr/mdec/installboot /mnt/boot /usr/mdec/biosboot ${1}
}
md_prep_fdisk() {
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md
index 40a6aafd707..b55ec02ae08 100644
--- a/distrib/landisk/ramdisk/install.md
+++ b/distrib/landisk/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.21 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.22 2009/05/31 17:49:53 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,8 +35,6 @@
ARCH=ARCH
md_installboot() {
- # $1 is the root disk
-
disklabel -B ${1}
# use extracted mdec if it exists (may be newer)
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index e475e3d95a5..90508a5c238 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.41 2009/05/30 21:57:17 krw Exp $
+# $OpenBSD: install.md,v 1.42 2009/05/31 17:49:53 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,16 +50,15 @@ md_installboot() {
[[ $disklabeltype == MBR ]] || return
- echo -n "Copying 'ofwboot' to the boot partition (${_disk}i)..."
if mount -t msdos /dev/${_disk}i /mnt2 ; then
if cp /usr/mdec/ofwboot /mnt2; then
umount /mnt2
- echo "done."
return
fi
fi
- echo "FAILED.\nYou will not be able to boot OpenBSD from $_disk."
+ echo "Failed to install bootblocks."
+ echo "You will not be able to boot OpenBSD from $_disk."
exit
}
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index ecabf6157f5..3e648df4d84 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.36 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.37 2009/05/31 17:49:53 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -36,7 +36,7 @@ ARCH=ARCH
md_installboot() {
cp /mnt/usr/mdec/bootsd /mnt/boot
- /mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
+ /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
}
md_prep_disklabel() {
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 589925a7f29..bd25c8740b6 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.34 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.35 2009/05/31 17:49:53 deraadt Exp $
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
#
@@ -46,7 +46,7 @@ md_installboot() {
fi
cp /mnt/usr/mdec/bootsd /mnt/boot
- /mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
+ /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a
}
md_prep_disklabel() {
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 36c222b93ce..aee8a837a4d 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.61 2009/05/11 17:13:07 deraadt Exp $
+# $OpenBSD: install.md,v 1.62 2009/05/31 17:49:53 deraadt Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -39,7 +39,7 @@ MDDKDEVS='/^sd[0-9] /s/ .*//p;/^x[dy][0-9] /s/ .*//p'
ARCH=ARCH
md_installboot() {
- local _rawdev=/dev/r${1}c _prefix
+ local _prefix
# use extracted mdec if it exists (may be newer)
if [ -e /mnt/usr/mdec/boot ]; then
@@ -53,7 +53,7 @@ md_installboot() {
cp ${_prefix}/boot /mnt/boot
sync
- installboot -v /mnt/boot ${_prefix}/bootxx ${_rawdev}
+ installboot /mnt/boot ${_prefix}/bootxx /dev/r${1}c
}
md_prep_disklabel() {
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index 511ae1d0dd0..76a7eedbc14 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.30 2009/05/20 18:42:05 deraadt Exp $
+# $OpenBSD: install.md,v 1.31 2009/05/31 17:49:53 deraadt Exp $
# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
#
#
@@ -42,7 +42,7 @@ NCPU=$(sysctl -n hw.ncpufound)
((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; }
md_installboot() {
- local _rawdev=/dev/r${1}c _prefix
+ local _prefix
cd /mnt
if [[ -f bsd.mp ]] && ((NCPU > 1)); then
@@ -51,28 +51,19 @@ md_installboot() {
mv bsd.mp bsd
fi
- # use extracted mdec if it exists (may be newer)
- if [ -e /mnt/usr/mdec/bootblk ]; then
- _prefix=/mnt/usr/mdec
- elif [ -e /usr/mdec/bootblk ]; then
- _prefix=/usr/mdec
- else
- echo No boot block prototypes found, you must run installboot manually.
- return
- fi
-
- ${_prefix}/installboot -v ${_prefix}/bootblk ${_rawdev}
- sync
-
+ # Figure out which /usr/mdec directory to use
if [ -e /mnt/usr/mdec/ofwboot ]; then
_prefix=/mnt/usr/mdec
elif [ -e /usr/mdec/ofwboot ]; then
_prefix=/usr/mdec
else
- echo No ofwboot found!
+ echo No boot block prototypes found, you must run installboot manually.
return
fi
+
cp ${_prefix}/ofwboot /mnt/ofwboot
+ sync
+ ${_prefix}/installboot ${_prefix}/bootblk /dev/r${1}c
}
md_prep_disklabel() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 20:11:33 +0000