Update to match the new bootblocks filenames.

4 files changed, 34 insertions, 22 deletions

diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 2e738e85060..79eca7eb363 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2009/05/14 18:58:16 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -13,9 +13,7 @@ all: ${CDROM}
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
-	#cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot
-	objcopy -Sg -R .comment ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot
-	strip ${.OBJDIR}/boot
+	cp ${DESTDIR}/usr/mdec/boot-IP32 ${.OBJDIR}/boot-IP32
 	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD} > ${.OBJDIR}/bsd
 	dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=8
 	vnconfig -v -c svnd0 ${.OBJDIR}/${FFS}
@@ -27,16 +25,19 @@ ${CDROM}:
 	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/bsd.rd
 	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd
 	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd
-	cp ${.OBJDIR}/boot ${.OBJDIR}/cd-dir/boot
+	cp ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot32
+	cp ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot64
 	umount ${.OBJDIR}/cd-dir
 	@df /dev/svnd0a
 	vnconfig -u svnd0
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
-	# would love to use -h 64, but boot is slightly too big
-	/usr/mdec/sgivol -i -h 88 svnd0 > ${.OBJDIR}/volhdr
-	/usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0
-	/usr/mdec/sgivol -l boot sashARCS svnd0
+	# boot32 needs 77, boot64 needs 173, and add some room for growth
+	/usr/mdec/sgivol -i -h 320 svnd0 > ${.OBJDIR}/volhdr
+	/usr/mdec/sgivol -w boot32 ${.OBJDIR}/boot32 svnd0
+	/usr/mdec/sgivol -l boot32 sashARCS svnd0
+	/usr/mdec/sgivol -w boot64 ${.OBJDIR}/boot64 svnd0
+	/usr/mdec/sgivol -l boot64 sash64 svnd0
 	vnconfig -u svnd0
 	dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \
 	    seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'`
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index fc9a40a802b..90265998b34 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2009/05/14 18:58:17 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -24,17 +24,20 @@ ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
 
-	objcopy -Sg -R .comment ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot
-	strip ${.OBJDIR}/boot
+	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/boot32
+	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/boot64
 	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD} > ${.OBJDIR}/bsd
 
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=224
 	vnconfig -v -c -t cdroot svnd0 ${.OBJDIR}/${CDROM}
 
-	# 22 * 2048 byte sectors = 44KB
-	/usr/mdec/sgivol -i -h 22 svnd0
-	/usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0
-	/usr/mdec/sgivol -l boot sashARCS svnd0
+	# boot32 needs 20 2048 byte sectors, boot64 needs 44,
+	# and add some room for growth
+	/usr/mdec/sgivol -i -h 80 svnd0
+	/usr/mdec/sgivol -w boot32 ${.OBJDIR}/boot32 svnd0
+	/usr/mdec/sgivol -l boot32 sashARCS svnd0
+	/usr/mdec/sgivol -w boot64 ${.OBJDIR}/boot64 svnd0
+	/usr/mdec/sgivol -l boot64 sash64 svnd0
 
 	disklabel -w svnd0 cdroot "OpenBSD/sgi     "
 	newfs /dev/rsvnd0a
@@ -43,7 +46,11 @@ ${CDROM}:
 
 	cp ${.OBJDIR}/bsd ${.OBJDIR}/cd-dir/bsd
 	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/bsd.rd
-	cp ${.OBJDIR}/boot ${.OBJDIR}/cd-dir/boot
+	cp ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot32
+	ln ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot-IP32
+	cp ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot64
+	ln ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot-IP27
+	ln ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot-IP30
 
 	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
@@ -65,7 +72,7 @@ unconfig:
 	-vnconfig -u svnd0
 
 clean cleandir:
-	/bin/rm -f ${CDROM} bsd boot
+	/bin/rm -f ${CDROM} bsd boot32 boot64 boot-IP27 boot-IP30 boot-IP32
 	rm -rf cd-dir
 
 .include <bsd.obj.mk>
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index 7a48c91d00f..31c48ff0a46 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2009/04/12 12:56:02 krw Exp $
+#	$OpenBSD: install.md,v 1.16 2009/05/14 18:58:17 miod Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@ __EOT
 	esac
 
 	echo "Installing boot loader in volume header."
-	/usr/mdec/sgivol -w boot /usr/mdec/boot $_disk
+	/usr/mdec/sgivol -w boot /usr/mdec/boot-`sysctl hw.model` $_disk
 	case $? in
 	0)
 		;;
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index bc063b13366..b2f7cc345cb 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.20 2009/05/03 00:25:30 deraadt Exp $
+#	$OpenBSD: list,v 1.21 2009/05/14 18:58:17 miod Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -59,7 +59,11 @@ SCRIPT	${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
 
 # we need the contents of /usr/mdec
-COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
+COPY	${DESTDIR}/usr/mdec/boot32		usr/mdec/boot32
+SYMLINK	${DESTDIR}/usr/mdec/boot32		usr/mdec/boot-IP32
+COPY	${DESTDIR}/usr/mdec/boot64		usr/mdec/boot64
+SYMLINK	${DESTDIR}/usr/mdec/boot64		usr/mdec/boot-IP27
+SYMLINK	${DESTDIR}/usr/mdec/boot64		usr/mdec/boot-IP30
 COPY	${DESTDIR}/usr/mdec/sgivol		usr/mdec/sgivol
 
 # various files that we need in /etc for the install