diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-16 16:45:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-16 16:45:05 +0000 |
| commit | 9c7ecaf10fb60f39c08c96d15ee99fceff0480ea (patch) | |
| tree | 118b7f22c57f3d33db0191a493cf93fd2fcbf213 /distrib | |
| parent | 1046560762bd76e676b9380a362a5706e599dd12 (diff) | |
use the baseXX /usr/mdec stuff post-install to put boot media on the
disk, rather than including it in the ramdisk
tested by landry
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/alpha/common/install.md | 17 | ||||
| -rw-r--r-- | distrib/alpha/common/list | 8 |
2 files changed, 5 insertions, 20 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index 34060ea8646..58ba7330f72 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.34 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.35 2012/10/16 16:45:04 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -34,18 +34,9 @@ MDXAPERTURE=1 md_installboot() { - local _rawdev=/dev/r${1}c - - # use extracted mdec if it exists (may be newer) - if [ -d /mnt/usr/mdec ]; then - # Use cat to avoid holes created by cp(1) - cat /mnt/usr/mdec/boot > /mnt/boot - /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx $_rawdev - elif [ -d /usr/mdec ]; then - # Use cat to avoid holes created by cp(1) - cat /usr/mdec/boot > /mnt/boot - /usr/mdec/installboot /mnt/boot /usr/mdec/bootxx $_rawdev - fi + # Use cat to avoid holes created by cp(1) + cat /mnt/usr/mdec/boot > /mnt/boot + /mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}c } md_prep_disklabel() { diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list index 7bf60466430..f36eea15921 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/common/list @@ -1,8 +1,7 @@ -# $OpenBSD: list,v 1.31 2010/10/18 04:07:49 deraadt Exp $ +# $OpenBSD: list,v 1.32 2012/10/16 16:45:04 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin -SRCDIRS sys/arch/alpha/stand # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -44,16 +43,11 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/more usr/bin/less 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 XXX - no it's not necessary and won't fit. -#COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot -#COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx - # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols |