From 888f7e20368cc2f1a7bc943bad29132ecec045d8 Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
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/iso/Makefile     | 5 +----
 distrib/hppa/ramdisk/Makefile | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'distrib/hppa')

diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 1b36d6304f6..a3517105f96 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2009/04/17 03:58:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2010/08/26 01:35:44 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -37,9 +37,6 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	dd if=${DESTDIR}/usr/mdec/cdboot of=${.OBJDIR}/${CDROM} \
 	    bs=32k count=1 conv=notrunc
-	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
-	disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}    "
-	vnconfig -u svnd0
 	dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM}
 
 install:
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