From 75314c027ebd997360a1c32f535007a708e65c8a Mon Sep 17 00:00:00 2001
From: krw <>
Date: Thu, 26 Aug 2010 01:35:44 +0000
Subject: [PATCH] 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@
---
 src/etc/etc.hppa/disktab | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/etc/etc.hppa/disktab b/src/etc/etc.hppa/disktab
index e661ab72..901ef4c1 100644
--- a/src/etc/etc.hppa/disktab
+++ b/src/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: