summaryrefslogtreecommitdiff
path: root/distrib/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-11 06:51:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-11 06:51:14 +0000
commita33dc763ae3666b02fe4cd35ae467e5009f84adc (patch)
treefc44b131ede72a5dac827b59544e5ed53f09e8be /distrib/i386
parentf4bb78c9010667ee27619382af28675e822dcaa5 (diff)
Use a no-emulation boot sector instead of a floppy emulation image. Work at
the hackathon by Tom and Toby, finally making it to the real world. Now we can tweak sizes of the media all we want, if we need to.
Diffstat (limited to 'distrib/i386')
-rw-r--r--distrib/i386/cdfs/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile
index 12b3a866d8b..e210aaeac22 100644
--- a/distrib/i386/cdfs/Makefile
+++ b/distrib/i386/cdfs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2004/03/11 22:16:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2004/08/11 06:51:13 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}/i386
- cp ${.OBJDIR}/../ramdisk_cd/${CDFS} ${.OBJDIR}/cd-dir/${OSREV}/i386
- mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkdir -p ${.OBJDIR}/cd-dir/etc
+ echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+ cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/i386
+ cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386
+ 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} i386 bootonly CD" \
-P "Copyright (c) 2004 Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
-V "OpenBSD/i386 ${OSREV} boot-only CD" \
- -b ${OSREV}/i386/${CDFS} -c ${OSREV}/i386/boot.catalog \
+ -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \
${.OBJDIR}/cd-dir
install: