[src/netbsd-1-5]: src/distrib/pmax/instkernel Pullup 1.18 [mhitch]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7d0d3b68a7b
branches:  netbsd-1-5
changeset: 490209:f7d0d3b68a7b
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Nov 13 20:32:06 2000 +0000

description:
Pullup 1.18 [mhitch]:
Change the disktype of the diskimage to what the kernel is looking for to
detect a 'miniroot' disklabel.  Booting from the diskimage will now get
the real disk geometry and adjust the incore disklabel parameters
accordingly.
Also revert back to using a prototype file - disklabel truncates the
disktype to 15 characters when using the disktab entry, but will use 16
characters when using the prototype file.

diffstat:

 distrib/pmax/instkernel/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 239e66a16040 -r f7d0d3b68a7b distrib/pmax/instkernel/Makefile
--- a/distrib/pmax/instkernel/Makefile  Mon Nov 13 20:08:01 2000 +0000
+++ b/distrib/pmax/instkernel/Makefile  Mon Nov 13 20:32:06 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2000/06/01 06:54:57 matt Exp $
+#      $NetBSD: Makefile,v 1.17.2.1 2000/11/13 20:32:06 tv Exp $
 
 .include "../../../Makefile.inc"
 .include <bsd.kernobj.mk>
@@ -10,7 +10,8 @@
 IMAGE=         diskimage
 IMAGESIZE=     4096 # 512 byte blocks, update disktab.diskimage if changed
 DISKTAB=       ${.CURDIR}/disktab.diskimage
-DISKTYPE=      miniroot
+DISKTYPE=      "install diskimag"
+LABELPROTO=    ${.CURDIR}/diskimage.label.proto
 NEWFSOPTS?=    -c 32 -B le -i 32768    # don't need many inodes!
 
 KERN=          ${KERNOBJDIR}/RAMDISK/netbsd
@@ -42,7 +43,7 @@
 ${IMAGE}.gz: netbsd.gz ${DESTDIR}/usr/mdec/boot.pmax
        dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE}
        vnconfig ${DISKTYPEARG} -v -c ${VND} ${IMAGE} ${VND_GEOM}
-       disklabel -rw -f ${DISKTAB} ${VND} ${DISKTYPE}
+       disklabel -R -r ${VND}  ${LABELPROTO}
        newfs -B le -m 0 -o space ${NEWFSOPTS} ${VND_RDEV}
        ${DESTDIR}/usr/mdec/installboot ${VND_RDEV} \
            ${DESTDIR}/usr/mdec/bootxx_ffs