From 888f7e20368cc2f1a7bc943bad29132ecec045d8 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 26 Aug 2010 01:35:45 +0000 Subject: Since Aug 2008, the kernel can successfully read the 1 block (512 byte) disklabels even in the midst of a larger sector. E.g. in bytes 512 - 1023 of the first 2048 byte sector on a CD. On hppa we plopped down such a disklabel on cdXX.iso and installXX.iso. Once accessible it took precedence over the spoofed label of the CD. Chaos ensued. Since there is currently no reason for this label on hppa cd's, eradicate it and its disktab entry. cdXX.iso/installXX.iso can now be mounted on hppa again. Also remove a commented out label plopping on Alpha, which references a non-existant disktab entry. Problem noted and exact diff creating problem discovered by marco@. ok deraadt@ --- distrib/hppa/ramdisk/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'distrib/hppa/ramdisk') diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index dd7bcae9f26..831de839fc6 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2009/04/17 15:59:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.19 2010/08/26 01:35:44 krw Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -57,9 +57,6 @@ ${CDROM}: bsd ${CDBOOT} -V "OpenBSD/hppa ${OSREV} boot-only CD" \ -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir dd if=${CDBOOT} of=${.OBJDIR}/${CDROM} bs=32k count=1 conv=notrunc - vnconfig -v -c ${VND} ${.OBJDIR}/${CDROM} - disklabel -w ${VND} fakecdrom "OpenBSD/hppa " - vnconfig -u ${VND} dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM} obsd: -- cgit v1.2.3