diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-17 02:06:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-17 02:06:42 +0000 |
| commit | 361ddf78343000af87909568db603336f0f839f7 (patch) | |
| tree | 2dfe51f5c01fd0bdefa453006e10fbaba44cf9c9 | |
| parent | 5ae0c9e10f51a65b1f7d643e3670c45fa0d81813 (diff) | |
use the baseXX installed goop in /mnt to install bootblocks
tested by krw
| -rw-r--r-- | distrib/sparc/install.md | 18 | ||||
| -rw-r--r-- | distrib/sparc/ramdisk/list.local | 9 |
2 files changed, 4 insertions, 23 deletions
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 0e8c09cab53..98322c0fffe 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.67 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.68 2012/10/17 02:06:39 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -38,22 +38,10 @@ MDXDM=y MDDKDEVS='/^sd[0-9] /s/ .*//p;/^x[dy][0-9] /s/ .*//p' md_installboot() { - local _prefix - - # use extracted mdec if it exists (may be newer) - if [ -e /mnt/usr/mdec/boot ]; then - _prefix=/mnt/usr/mdec - elif [ -e /usr/mdec/boot ]; then - _prefix=/usr/mdec - else - echo No boot block prototypes found, you must run installboot manually. - return - fi - # Use cat to avoid holes created by cp(1) - cat ${_prefix}/boot > /mnt/boot + cat /mnt/usr/mdec/boot > /mnt/boot sync - installboot /mnt/boot ${_prefix}/bootxx /dev/r${1}c + /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}c } md_prep_disklabel() { diff --git a/distrib/sparc/ramdisk/list.local b/distrib/sparc/ramdisk/list.local index 5d12070d526..b1deb1750f3 100644 --- a/distrib/sparc/ramdisk/list.local +++ b/distrib/sparc/ramdisk/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.3 2012/07/22 18:34:34 deraadt Exp $ +# $OpenBSD: list.local,v 1.4 2012/10/17 02:06:41 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's @@ -8,9 +8,6 @@ LINK instbin sbin/disklabel #LINK instbin sbin/restore LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep LINK instbin usr/bin/less usr/bin/more -LINK instbin usr/sbin/installboot - -SRCDIRS sys/arch/sparc/stand SYMLINK /tmp var/tmp @@ -18,10 +15,6 @@ SYMLINK /tmp var/tmp SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -# we need the contents of /usr/mdec (but not boot or binstall) -COPYDIR ${DESTDIR}/usr/mdec usr/mdec -SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot - # various files that we need in /etc for the install SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf |