summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-10-16 23:07:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-10-16 23:07:21 +0000
commit9f83a17b2b7314a37883b0a297834308b45ffbbd (patch)
treeb4bbddcd9be38e20107a7a112e3c2af650ba33e4 /distrib
parent1ac765479a8e6fb812c508773e284fe6926d4b3e (diff)
use the baseXX installed goop in /mnt to install bootblocks
tested by kettenis
Diffstat (limited to 'distrib')
-rw-r--r--distrib/socppc/ramdisk/install.md4
-rw-r--r--distrib/socppc/ramdisk/list5
2 files changed, 4 insertions, 5 deletions
diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md
index 3d59dfa895f..fec94724e1f 100644
--- a/distrib/socppc/ramdisk/install.md
+++ b/distrib/socppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.16 2012/07/10 14:25:00 halex Exp $
+# $OpenBSD: install.md,v 1.17 2012/10/16 23:07:20 deraadt Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
md_installboot() {
local _disk=$1
- if dd if=/usr/mdec/boot.elf of=/dev/${_disk}i; then
+ if dd if=/mnt/usr/mdec/boot.elf of=/dev/${_disk}i; then
return
fi
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 76dd2313582..0f38ffb6ecc 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.13 2011/08/02 01:14:28 deraadt Exp $
+# $OpenBSD: list,v 1.14 2012/10/16 23:07:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -62,8 +62,7 @@ LINK instbin sbin/sysctl
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
-# we need the contents of /usr/mdec
-COPY ${DESTDIR}/usr/mdec/boot.elf usr/mdec/boot.elf
+# for fdisk(8)
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
# various files that we need in /etc for the install