diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-06-08 19:16:20 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-06-08 19:16:20 +0000 |
| commit | 2e3bfa5b3ba985c5f9f88c52415b00c4acbb1206 (patch) | |
| tree | 7286a5977a5e72e5acdce544ecb1f9ba43b1fac9 /distrib | |
| parent | baf98fd5895bb37d87dc18b2d265fa639648d5e2 (diff) | |
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.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/sparc/cdfs/Makefile | 3 | ||||
| -rw-r--r-- | distrib/sparc/iso/Makefile | 3 | ||||
| -rw-r--r-- | distrib/sparc64/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/iso/Makefile | 6 |
4 files changed, 14 insertions, 4 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}/ |