diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 17:21:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 17:21:05 +0000 |
| commit | 2ba06b460a6fb669c10e73c795d4722e0969f0c6 (patch) | |
| tree | 6d75d2bfbfc2926030ea19423aa2dd56f878ae1c /distrib/amd64 | |
| parent | 3b7df0f5541178ecb3f438c5bccee271b2e5e526 (diff) | |
use the baseXX installed /usr/mdec directory instead of placing lots of
heavy boot media into the ramdisk. i386 tested by okan, amd64 tested
by florian.
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/common/install.md | 6 | ||||
| -rw-r--r-- | distrib/amd64/common/list | 7 | ||||
| -rw-r--r-- | distrib/amd64/ramdiskA/list.local | 4 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/list.local | 4 |
4 files changed, 7 insertions, 14 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 1472086b241..36827e94f9e 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.31 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.32 2012/10/15 17:21:04 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -40,8 +40,8 @@ NCPU=$(sysctl -n hw.ncpufound) md_installboot() { # Use cat to avoid holes created by cp(1) - cat /usr/mdec/boot > /mnt/boot - if ! /usr/mdec/installboot /mnt/boot /usr/mdec/biosboot ${1} ; then + cat /mnt/usr/mdec/boot > /mnt/boot + if ! /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/biosboot ${1} ; then echo "\nFailed to install bootblocks." echo "You will not be able to boot OpenBSD from ${1}." exit diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list index 39c9e64a15d..8cb6818d9b5 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/common/list @@ -1,7 +1,6 @@ -# $OpenBSD: list,v 1.25 2012/10/12 14:07:46 jsing Exp $ +# $OpenBSD: list,v 1.26 2012/10/15 17:21:04 deraadt Exp $ SRCDIRS distrib/special -SRCDIRS sys/arch/amd64/stand SRCDIRS bin sbin usr.bin usr.sbin # copy the crunched binary, link to it, and kill it @@ -51,14 +50,12 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/less usr/bin/more LINK instbin usr/bin/sed LINK instbin sbin/sysctl -LINK instbin usr/mdec/installboot # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -# we need the contents of /usr/mdec -COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot +# for fdisk(8) COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr # various files that we need in /etc for the install diff --git a/distrib/amd64/ramdiskA/list.local b/distrib/amd64/ramdiskA/list.local index 2b3915f6a33..98798ba6fc6 100644 --- a/distrib/amd64/ramdiskA/list.local +++ b/distrib/amd64/ramdiskA/list.local @@ -1,5 +1,3 @@ -# $OpenBSD: list.local,v 1.3 2012/10/13 16:58:08 deraadt Exp $ +# $OpenBSD: list.local,v 1.4 2012/10/15 17:21:04 deraadt Exp $ #TZ # this does not fit on the floppy - -COPY ${DESTDIR}/usr/mdec/fdboot usr/mdec/boot diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local index 29e5b3b95ff..6d27bea458f 100644 --- a/distrib/amd64/ramdisk_cd/list.local +++ b/distrib/amd64/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.20 2012/10/12 14:07:46 jsing Exp $ +# $OpenBSD: list.local,v 1.21 2012/10/15 17:21:04 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin bin/sha256 @@ -13,8 +13,6 @@ LINK instbin sbin/mount_ext2fs LINK instbin sbin/mount_msdos LINK instbin sbin/mount_udf -COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot - COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06 |