Revert fakecdrom elimination pending further testing. ariane@ pointed

out that sparc64 iso at least does not boot. Retain the svnd -> vnd
changes that happened after the original commit.

6 files changed, 34 insertions, 6 deletions

diff --git a/distrib/sparc/cdfs/Makefile b/distrib/sparc/cdfs/Makefile
index 35c35d83994..371e3605ad1 100644
--- a/distrib/sparc/cdfs/Makefile
+++ b/distrib/sparc/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2011/04/18 16:52:10 thib Exp $
+#	$OpenBSD: Makefile,v 1.9 2011/06/08 19:16:19 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -27,6 +27,7 @@ ${CDROM}:
 	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f1` \
 	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f2` \
 	    /mnt/${OSREV}/sparc/boot /usr/mdec/bootxx /dev/rvnd0c
+	disklabel -w vnd0 fakecdrom "OpenBSD/sparc   "
 	umount /mnt
 	vnconfig -u vnd0
 	# XXX Some sparc machines fail to load the kernel correctly if the
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
index 7da1867330d..70acdc35ac8 100644
--- a/distrib/sparc/iso/Makefile
+++ b/distrib/sparc/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2011/04/18 16:52:10 thib Exp $
+#	$OpenBSD: Makefile,v 1.9 2011/06/08 19:16:19 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -45,6 +45,7 @@ ${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/rvnd0c
+	disklabel -w vnd0 fakecdrom "OpenBSD/${MACHINE}   "
 	umount /mnt
 	vnconfig -u vnd0
 	# XXX Some ${MACHINE} machines fail to load the kernel correctly if the
diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile
index a60e302e17f..d14437cca6a 100644
--- a/distrib/sparc64/cdfs/Makefile
+++ b/distrib/sparc64/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2011/04/10 20:00:43 krw Exp $
+#	$OpenBSD: Makefile,v 1.16 2011/06/08 19:16:19 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -28,6 +28,10 @@ ${CDROM}:
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/sparc64 ${OSREV} boot-only CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
+	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
+	disklabel -w vnd0 fakecdrom "OpenBSD${REV}sparc64"
+	vnconfig -u vnd0
+	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 257ac8433ff..4e16b9b701e 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2011/04/10 20:00:43 krw Exp $
+#	$OpenBSD: Makefile,v 1.11 2011/06/08 19:16:19 krw Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -41,6 +41,10 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
+	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
+	disklabel -w vnd0 fakecdrom "OpenBSD${REV}${MACHINE}"
+	vnconfig -u vnd0
+	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
 
 install:
 	cp ${CDROM} ${RELDIR}/
diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab
index cff1368186b..172680c562e 100644
--- a/etc/etc.sparc/disktab
+++ b/etc/etc.sparc/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.24 2011/04/10 20:00:43 krw Exp $
+# $OpenBSD: disktab,v 1.25 2011/06/08 19:16:19 krw Exp $
 
 miniroot:\
 	:ty=winchester:se#512:nt#2:rm#300:ns#64:nc#96:\
@@ -17,3 +17,12 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
+
+# test if not having an 'a' works?
+fakecdrom|Fake image for Bootable CDROM:\
+	:ty=winchester:se#512:nt#1:rm#350:ns#640:nc#2048:\
+	:pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
+	:pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\
+	:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
+	:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
+
diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab
index 6e0b6045803..91268f233d2 100644
--- a/etc/etc.sparc64/disktab
+++ b/etc/etc.sparc64/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.14 2011/04/10 20:00:43 krw Exp $
+# $OpenBSD: disktab,v 1.15 2011/06/08 19:16:19 krw Exp $
 
 miniroot:\
 	:ty=winchester:se#512:nt#2:rm#300:ns#64:nc#90:\
@@ -19,7 +19,16 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
+# test if not having an 'a' works?
+fakecdrom|Fake image for Bootable CDROM:\
+	:ty=winchester:se#512:nt#1:rm#350:ns#640:nc#2048:\
+	:pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
+	:pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\
+	:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
+	:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
+
 fakeramdisk:\
 	:ty=winchester:se#512:nt#1:rm#350:ns#32:nc#180:\
 	:pa#5760:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
 	:pc#5760:oc#0:
+