diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 16:15:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 16:15:35 +0000 |
| commit | 996e51bd2c7fdec931d33d64550dafe29480956f (patch) | |
| tree | a5fd0a513ad1a1eb8776bdb456db07d70d094806 /distrib | |
| parent | fa53f65f4639d7ecb60852b6da77de55ea458791 (diff) | |
Put less boot stuff into ramdisk /usr/mdec; tested by phessler
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/loongson/ramdisk/install.md | 4 | ||||
| -rw-r--r-- | distrib/loongson/ramdisk/list | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/distrib/loongson/ramdisk/install.md b/distrib/loongson/ramdisk/install.md index b10cfae7fe2..fc18c5cd7c7 100644 --- a/distrib/loongson/ramdisk/install.md +++ b/distrib/loongson/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.12 2012/10/15 16:15:34 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ md_installboot() { # Use cat below to avoid holes created by cp(1) if mount -t ext2fs /dev/${_disk}i /mnt2 && mkdir -p /mnt2/boot && - cat /usr/mdec/boot > /mnt2/boot/boot && + cat /mnt/usr/mdec/boot > /mnt2/boot/boot && { [[ $(sysctl -n hw.product) != Gdium ]] || cp /mnt/bsd /mnt2/boot/bsd; }; then umount /mnt2 diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index 998a05c9541..4f1dc9a546e 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2011/08/02 01:14:28 deraadt Exp $ +# $OpenBSD: list,v 1.8 2012/10/15 16:15:34 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -65,6 +65,9 @@ LINK instbin sbin/sysctl SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk +# for fdisk(8) +COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr + # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -76,10 +79,6 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts TERMCAP vt100,vt220,dumb usr/share/misc/termcap -# files in /usr/mdec -COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # firmware we might need COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573 |