From f0d476b9e6adfed309557a4411fdb5c8ebccd9cc Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Mon, 23 Aug 2004 14:30:22 +0000
Subject: switch to non-emulation cd booting

---
 distrib/amd64/cdfs/Makefile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
index 9df7c8106bc..3c8582eda4d 100644
--- a/distrib/amd64/cdfs/Makefile
+++ b/distrib/amd64/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 2004/03/11 22:16:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2004/08/23 14:30:21 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDFS=	cdrom${REV}.fs
+BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 
 all: ${CDROM}
@@ -12,13 +12,17 @@ all: ${CDROM}
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	cp ${.OBJDIR}/../ramdisk_cd/${CDFS} ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+	mkdir -p ${.OBJDIR}/cd-dir/etc
+	echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/cdboot
+	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
 	    -A "OpenBSD ${OSREV} amd64 bootonly CD" \
 	    -P "Copyright (c) 2004 Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/amd64   ${OSREV} boot-only CD" \
-	    -b ${OSREV}/amd64/${CDFS} -c ${OSREV}/amd64/boot.catalog \
+	    -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
 install:
-- 
cgit v1.2.3