diff options
| -rw-r--r-- | distrib/amd64/common/install.md | 4 | ||||
| -rw-r--r-- | distrib/hp300/ramdisk/install.md | 4 | ||||
| -rw-r--r-- | distrib/i386/common/install.md | 4 | ||||
| -rw-r--r-- | distrib/landisk/ramdisk/install.md | 5 | ||||
| -rw-r--r-- | distrib/mvme68k/ramdisk/install.md | 3 | ||||
| -rw-r--r-- | distrib/mvme88k/ramdisk/install.md | 3 | ||||
| -rw-r--r-- | distrib/sparc/install.md | 5 | ||||
| -rw-r--r-- | distrib/vax/install.md | 3 |
8 files changed, 9 insertions, 22 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 1fcbe3845e3..895d9ef69e6 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.17 2009/04/30 00:03:06 deraadt Exp $ +# $OpenBSD: install.md,v 1.18 2009/05/09 21:37:26 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -47,10 +47,8 @@ md_installboot() { mv bsd.mp bsd fi - echo Installing boot block... cp /usr/mdec/boot /mnt/boot /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1} - echo "done." } md_prep_fdisk() { diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index 79adad9541e..ad086f789f9 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.49 2009/04/12 12:56:01 krw Exp $ +# $OpenBSD: install.md,v 1.50 2009/05/09 21:37:26 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. @@ -38,9 +38,7 @@ MDDKDEVS="/^[hs]d[0-9][0-9]* /s/ .*//p" md_installboot() { # $1 is the root disk - echo -n "Installing boot block..." disklabel -B ${1} - echo "done." } md_prep_disklabel() { diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index cfe9f4ff82e..af995e57d2b 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.40 2009/04/30 00:03:08 deraadt Exp $ +# $OpenBSD: install.md,v 1.41 2009/05/09 21:37:26 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -47,12 +47,10 @@ md_installboot() { mv bsd.mp bsd fi - echo Installing boot block... # 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} - echo "done." } md_prep_fdisk() { diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index 1baba0e73d2..d3b4a879f8e 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.19 2009/04/30 00:03:08 deraadt Exp $ +# $OpenBSD: install.md,v 1.20 2009/05/09 21:37:26 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,6 @@ ARCH=ARCH md_installboot() { # $1 is the root disk - echo -n "Installing boot block..." disklabel -B ${1} # use extracted mdec if it exists (may be newer) @@ -46,8 +45,6 @@ md_installboot() { elif [ -d /usr/mdec ]; then cp /usr/mdec/boot /mnt/boot fi - - echo "done." } md_prep_fdisk() { diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md index e3912e24c61..6ae508353f3 100644 --- a/distrib/mvme68k/ramdisk/install.md +++ b/distrib/mvme68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.34 2009/04/12 12:56:02 krw Exp $ +# $OpenBSD: install.md,v 1.35 2009/05/09 21:37:26 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -35,7 +35,6 @@ MDTERM=vt100 ARCH=ARCH md_installboot() { - echo "Installing boot block..." cp /mnt/usr/mdec/bootsd /mnt/boot /mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a } diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index 244f1ec7fd1..369050d4767 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.32 2009/04/24 01:43:27 krw Exp $ +# $OpenBSD: install.md,v 1.33 2009/05/09 21:37:26 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -45,7 +45,6 @@ md_installboot() { mv bsd.mp bsd fi - echo "Installing boot block..." cp /mnt/usr/mdec/bootsd /mnt/boot /mnt/usr/mdec/installboot -v /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}a } diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index b1b60512036..6d5c3b71df3 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.59 2009/04/25 03:21:51 deraadt Exp $ +# $OpenBSD: install.md,v 1.60 2009/05/09 21:37:26 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -51,9 +51,8 @@ md_installboot() { return fi - echo Installing boot block... cp ${_prefix}/boot /mnt/boot - sync; sync; sync + sync installboot -v /mnt/boot ${_prefix}/bootxx ${_rawdev} } diff --git a/distrib/vax/install.md b/distrib/vax/install.md index 412cd0d54cc..d294c81ce6e 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.31 2009/04/12 12:56:02 krw Exp $ +# $OpenBSD: install.md,v 1.32 2009/05/09 21:37:26 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -40,7 +40,6 @@ MDMTDEVS='/^[cms]t[0-9][0-9]* /s/ .*//p;/^ts[0-9]0-9]* /s/ .*//p' ARCH=ARCH md_installboot() { - echo "Installing boot block..." cp /mnt/usr/mdec/boot /mnt/boot /sbin/disklabel -B $1 } |