diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 18:17:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-15 18:17:40 +0000 |
| commit | b647d2e5458f9c21f6802644d48a19cd864872a5 (patch) | |
| tree | 97e6ed0066d3dd6b1a3864783bd5b7c6cdbbc3e7 /distrib/sparc64 | |
| parent | c4d8ced5fcf6e00a4d227de36a39937607dbb6fa (diff) | |
Always use the baseXX extracted install media stuff; only put the minimum
onto the ramdisk.
tested by okan
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/common/install.md | 18 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/list | 7 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/list | 7 |
3 files changed, 5 insertions, 27 deletions
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md index ecfe74969f0..1bbe43905a9 100644 --- a/distrib/sparc64/common/install.md +++ b/distrib/sparc64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.38 2012/07/13 14:50:34 halex Exp $ +# $OpenBSD: install.md,v 1.39 2012/10/15 18:17:38 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -41,22 +41,10 @@ NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } md_installboot() { - local _prefix - - # Figure out which /usr/mdec directory to use - if [ -e /mnt/usr/mdec/ofwboot ]; then - _prefix=/mnt/usr/mdec - elif [ -e /usr/mdec/ofwboot ]; 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}/ofwboot > /mnt/ofwboot + cat /mnt/usr/mdec/ofwboot > /mnt/ofwboot sync - ${_prefix}/installboot ${_prefix}/bootblk /dev/r${1}c + /mnt/usr/mdec/installboot /mnt/usr/mdec/bootblk /dev/r${1}c } md_prep_disklabel() { diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index 0864c0ec841..f2ae663100d 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.36 2010/10/18 04:08:32 deraadt Exp $ +# $OpenBSD: list,v 1.37 2012/10/15 18:17:39 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -54,11 +54,6 @@ 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/installboot usr/mdec/installboot -#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot -#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk - # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index 8e65e98f819..af687c699eb 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.30 2010/10/18 04:08:32 deraadt Exp $ +# $OpenBSD: list,v 1.31 2012/10/15 18:17:39 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -52,11 +52,6 @@ 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/installboot usr/mdec/installboot -#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot -#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk - # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd |