three floppies, and a bsd.rd for the CD

12 files changed, 135 insertions, 21 deletions

diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile
index d05e40f71b7..379159877a3 100644
--- a/distrib/alpha/Makefile
+++ b/distrib/alpha/Makefile
@@ -1,5 +1,11 @@
-#	$OpenBSD: Makefile,v 1.4 1997/09/17 14:19:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2001/01/29 21:25:45 deraadt Exp $
 
-SUBDIR= ramdisk
+SUBDIR= bsd.rd floppy floppyB # floppyC
+
+unconfig:
+	cd bsd.rd; ${MAKE} unconfig
+	cd floppy; ${MAKE} unconfig
+	cd floppyB; ${MAKE} unconfig
+#	cd floppyC; ${MAKE} unconfig
 
 .include <bsd.subdir.mk>
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
new file mode 100644
index 00000000000..555d2ccc3ae
--- /dev/null
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -0,0 +1,87 @@
+#	$OpenBSD: Makefile,v 1.1 2001/01/29 21:25:46 deraadt Exp $
+
+TOP=		${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+IMAGE=		ramdisk${REV}.fs
+CRUNCHCONF?=    ${TOP}/ramdisk/${CBIN}.conf
+
+MOUNT_POINT=	/mnt
+
+VND?=		svnd0
+VND_DEV=	/dev/${VND}a
+VND_RDEV=	/dev/r${VND}a
+VND_CRDEV=	/dev/r${VND}c
+PID!=		echo $$$$
+REALIMAGE!=	echo /var/tmp/image.${PID}
+
+STRIP?=		strip
+GZIP?=		gzip
+GZIPFLAGS?=	-9f
+INSTALLBOOT?=	/usr/mdec/installboot -v
+
+RAMDISK=	RAMDISKBIG
+BOOT?=		/usr/mdec/boot
+BOOTXX?=	/usr/mdec/bootxx
+
+RDSETROOT=	elfrdsetroot
+
+.include "${TOP}/inst-common/Makefile.inc"
+
+all: ${CBIN} bsd.rd
+	@echo "all done"
+
+DISKTYPE=       rdroot
+NBLKS=          5744
+
+# old format, minfree, opt, b/i  trks, sects, cpg
+NEWFSARGS=	-t ffs -m 0 -o space
+NEWFSARGS_RD=	-i 8192 -c 80
+NEWFSARGS_FD=	-i 524288 -c 80
+
+bsd.rd:	bsd.rd_unz
+	objcopy -Sg -R .comment bsd.rd_unz bsd.strip
+	${STRIP} bsd.strip
+	${GZIP} -c ${GZIPFLAGS} bsd.strip > bsd.rd
+
+bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
+	cp bsd bsd.rd_unz
+	${.OBJDIR}/${RDSETROOT} bsd.rd_unz < ${IMAGE}
+
+bsd:
+	cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
+	cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
+	    make depend && make clean && COPTS=-Os make
+	cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd
+
+${IMAGE}:	do_prep do_mount do_files do_umount
+	mv -f ${REALIMAGE} ${IMAGE}
+
+ecoffrdsetroot:	${TOP}/ecoffrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o ecoffrdsetroot ${TOP}/ecoffrdsetroot.c
+
+elfrdsetroot: ${TOP}/elfrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot ${TOP}/elfrdsetroot.c
+
+do_prep:
+	dd if=/dev/zero of=${REALIMAGE} count=${NBLKS}
+	vnconfig -v -c ${VND} ${REALIMAGE}
+	disklabel -w -r ${VND} ${DISKTYPE}
+	
+do_mount:
+	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
+	mount ${VND_DEV} ${MOUNT_POINT}
+ 
+do_umount:
+	@echo ""
+	@df -i ${MOUNT_POINT}
+	@echo ""
+	umount ${MOUNT_POINT}
+	vnconfig -u ${VND}
+
+unconfig:
+	-umount ${MOUNT_POINT}
+	-vnconfig -u ${VND}
+
+beforeinstall:
+	cp bsd.rd ${DESTDIR}/snapshot
diff --git a/distrib/alpha/ramdisk/Makefile b/distrib/alpha/common/Makefile.inc
index 9704ffab7b7..e8c2b8e2acd 100644
--- a/distrib/alpha/ramdisk/Makefile
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,11 +1,10 @@
-#	$OpenBSD: Makefile,v 1.22 2001/01/23 20:54:40 art Exp $
+#	$OpenBSD: Makefile.inc,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		ramdisk${REV}.fs
 CRUNCHCONF?=    ${TOP}/ramdisk/${CBIN}.conf
-BASE=		ramdisk
 
 MOUNT_POINT=	/mnt
 
@@ -21,7 +20,8 @@ GZIP?=		gzip
 GZIPFLAGS?=	-9f
 INSTALLBOOT?=	/usr/mdec/installboot -v
 
-FLOPPY?=	floppy${REV}.fs
+XNAME?=		floppy
+FLOPPY?=	${XNAME}${REV}.fs
 FLOPPYBLKS?=	2880
 FLOPPYTYPE?=	floppy3
 BOOT?=		/usr/mdec/boot
@@ -75,10 +75,10 @@ bsd.rd: bsd ${IMAGE} ${RDSETROOT}
 	${.OBJDIR}/${RDSETROOT} bsd.rd < ${IMAGE}
 
 bsd:
-	cd ${.CURDIR}/../../../sys/arch/alpha/conf && config RAMDISK
-	cd ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISK && \
+	cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
+	cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
 	    make depend && make clean && COPTS=-Os make
-	cp ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISK/bsd bsd
+	cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd
 
 ${IMAGE}:	do_prep do_mount do_files do_umount
 	mv -f ${REALIMAGE} ${IMAGE}
@@ -110,4 +110,4 @@ unconfig:
 	-vnconfig -u ${VND}
 
 beforeinstall:
-	cp ${FLOPPY} bsd.rd ${DESTDIR}/snapshot
+	cp ${FLOPPY} ${DESTDIR}/snapshot
diff --git a/distrib/alpha/ramdisk/disktab.preinstall b/distrib/alpha/common/disktab.preinstall
index 06d70368756..075cb424ea2 100644
--- a/distrib/alpha/ramdisk/disktab.preinstall
+++ b/distrib/alpha/common/disktab.preinstall
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: disktab.preinstall,v 1.1 1997/05/07 12:46:54 niklas Exp $
+#	$OpenBSD: disktab.preinstall,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/distrib/alpha/ramdisk/disktab.shadow b/distrib/alpha/common/disktab.shadow
index a8dc67ed293..3c23c5df96d 100644
--- a/distrib/alpha/ramdisk/disktab.shadow
+++ b/distrib/alpha/common/disktab.shadow
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: disktab.shadow,v 1.1 1997/05/07 12:46:55 niklas Exp $
+#	$OpenBSD: disktab.shadow,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/distrib/alpha/ramdisk/dot.profile b/distrib/alpha/common/dot.profile
index 542d06a1bc1..92f6b59beb0 100644
--- a/distrib/alpha/ramdisk/dot.profile
+++ b/distrib/alpha/common/dot.profile
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: dot.profile,v 1.12 2001/01/23 20:54:41 art Exp $
+#	$OpenBSD: dot.profile,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/common/install.md
index 1d91862df9c..b78aacf8c39 100644
--- a/distrib/alpha/ramdisk/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.34 2000/04/24 16:33:44 millert Exp $
+#       $OpenBSD: install.md,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -70,11 +70,11 @@ md_get_msgbuf() {
 }
 
 md_get_diskdevs() {
-	md_get_msgbuf | egrep "^[sw]d[0-9]+ " | cutword 1
+	md_get_msgbuf | egrep -a "^[sw]d[0-9]+ " | cutword 1
 }
 
 md_get_cddevs() {
-	md_get_msgbuf | egrep "^cd[0-9]+ " | cutword 1
+	md_get_msgbuf | egrep -a "^cd[0-9]+ " | cutword 1
 }
 
 md_get_partition_range() {
diff --git a/distrib/alpha/ramdisk/list b/distrib/alpha/common/list
index de2db1d9743..8375dad96d3 100644
--- a/distrib/alpha/ramdisk/list
+++ b/distrib/alpha/common/list
@@ -1,16 +1,16 @@
-#	$OpenBSD: list,v 1.8 2001/01/23 20:54:41 art Exp $
+#	$OpenBSD: list,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 
 # we strip comments from files since we need the space...
 
 # the disktab explanation file
-#SPECIAL sed -e '/^#[ 	].*$/d' < ${CURDIR}/disktab.preinstall > etc/disktab.preinstall
+#SPECIAL sed -e '/^#[ 	].*$/d' < ${CURDIR}/../common/disktab.preinstall > etc/disktab.preinstall
 
 # and the installation tools
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/disktab.shadow > etc/disktab.shadow
+SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../common/dot.profile > .profile
+SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../common/disktab.shadow > etc/disktab.shadow
 SPECIAL	sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
 #SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/install.md > install.md
+SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/../common/install.md > install.md
 SPECIAL	chmod 755 install
 #SPECIAL chmod 755 upgrade
diff --git a/distrib/alpha/ramdisk/raminst.conf b/distrib/alpha/common/raminst.conf
index 00054a789cc..c511a3fc1f5 100644
--- a/distrib/alpha/ramdisk/raminst.conf
+++ b/distrib/alpha/common/raminst.conf
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: raminst.conf,v 1.19 2001/01/23 20:54:41 art Exp $
+#	$OpenBSD: raminst.conf,v 1.1 2001/01/29 21:25:46 deraadt Exp $
 #
 # ram.conf - unified binary for the RAM disk
 #
diff --git a/distrib/alpha/floppy/Makefile b/distrib/alpha/floppy/Makefile
new file mode 100644
index 00000000000..6cbb7b29177
--- /dev/null
+++ b/distrib/alpha/floppy/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2001/01/29 21:25:48 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdisk
+RAMDISK=RAMDISK
+XNAME=floppy
+
+.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/alpha/floppyB/Makefile b/distrib/alpha/floppyB/Makefile
new file mode 100644
index 00000000000..7ca5c04761f
--- /dev/null
+++ b/distrib/alpha/floppyB/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2001/01/29 21:25:48 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdisk
+RAMDISK=RAMDISKB
+XNAME=floppyB
+
+.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/alpha/floppyC/Makefile b/distrib/alpha/floppyC/Makefile
new file mode 100644
index 00000000000..29680d3dcdf
--- /dev/null
+++ b/distrib/alpha/floppyC/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2001/01/29 21:25:49 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdisk
+RAMDISK=RAMDISKC
+XNAME=floppyC
+
+.include "${.CURDIR}/../common/Makefile.inc"