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@

5 files changed, 5 insertions, 18 deletions

diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile
index 9cb7a7eb1a7..5854ab1b886 100644
--- a/distrib/alpha/cdfs/Makefile
+++ b/distrib/alpha/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2010/08/26 01:35:44 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -33,7 +33,6 @@ ${CDROM}:
 	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
 	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
 	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c
-	#disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}   "
 	umount /mnt
 	vnconfig -u svnd0
 
diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 3933054081e..daf477e9cbd 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2010/08/26 01:35:44 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -45,7 +45,6 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
 	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
 	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c
-	#disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}   "
 	umount /mnt
 	vnconfig -u svnd0
 
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:
diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab
index e661ab72a97..901ef4c129c 100644
--- a/etc/etc.hppa/disktab
+++ b/etc/etc.hppa/disktab
@@ -1,11 +1,6 @@
-#	$OpenBSD: disktab,v 1.7 2010/07/02 20:33:54 tedu Exp $
+#	$OpenBSD: disktab,v 1.8 2010/08/26 01:35:44 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#18:nt#2:ns#128:\
 	:ta=4.2BSD:oa#0:pa#4608:fa#1024:ba#8192:\
 	:ob#0:pb#0:oc#0:pc#4608:
-
-fakecdrom|Fake image for Bootable CDROM:\
-	:ty=removable:se#512:nt#1:rm#350:ns#640:nc#2048:\
-	:pa#1310720:oa#0:ba#8192:fa#1024:ta=ISO9660:\
-	:pc#1310720:oc#0:bc#8192:fc#1024:tc=ISO9660: