[src/trunk]: src/etc/etc.sgimips Remove all references to vnd usage here now ...

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

details:   https://anonhg.NetBSD.org/src/rev/d5732000cfde
branches:  trunk
changeset: 571456:d5732000cfde
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Nov 24 22:01:42 2004 +0000

description:
Remove all references to vnd usage here now that sgivol works correctly on file
images

diffstat:

 etc/etc.sgimips/Makefile.inc |  22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 76231f21f4e9 -r d5732000cfde etc/etc.sgimips/Makefile.inc
--- a/etc/etc.sgimips/Makefile.inc      Wed Nov 24 22:01:21 2004 +0000
+++ b/etc/etc.sgimips/Makefile.inc      Wed Nov 24 22:01:42 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.10 2004/11/13 10:27:14 sekiya Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2004/11/24 22:01:42 jmc Exp $
 #
 #      etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
 #
@@ -22,13 +22,17 @@
 SGI.image= ${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-sgimips.img
 
 iso-image-md-post:
-       dd if=/dev/zero of=${SGI.image} bs=1m count=120
-       vnconfig vnd0 ${SGI.image}
-       ${TOOLDIR}/bin/nbsgivol -f -i vnd0
-       ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot vnd0
-       ${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${DESTDIR}/usr/mdec/ip2xboot vnd0
-       ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot vnd0
-       vnconfig -u vnd0
-       dd if=${CDROM.image} of=${SGI.image} bs=512 seek=3135
+       dd if=/dev/zero of=${SGI.image} bs=1024k count=120
+       ${TOOLDIR}/bin/nbsgivol -f -i ${SGI.image}
+       ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot \
+               ${SGI.image}
+       ${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${DESTDIR}/usr/mdec/ip2xboot \
+               ${SGI.image}
+       ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot \
+               ${SGI.image}
+# Don't hardcode this. Pick it up from bootblock.h
+       SEEK=`egrep SGI_BOOT_BLOCK_SIZE_VOLHDR \
+               ${.CURDIR}/../../sys/sys/bootblock.h | sed -e 's/[^0-9]*//'`; \
+               dd if=${CDROM.image} of=${SGI.image} bs=512 seek=$${SEEK}
        mv ${SGI.image} ${CDROM.image}
        rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x