Support a third boot floppy, Soon this should go to one supported, but not yet.

Use "standard" install.sub file not port specific version.

2 files changed, 23 insertions, 10 deletions

diff --git a/distrib/powerpc/ramdisk/Makefile b/distrib/powerpc/ramdisk/Makefile
index ff899540d1c..960000b24cf 100644
--- a/distrib/powerpc/ramdisk/Makefile
+++ b/distrib/powerpc/ramdisk/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 1998/05/29 04:34:19 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/09/09 04:32:57 rahnds Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 BSD_RD=		bsd.rd
 BSDOFW_RD=	bsdofw.rd
+BSDMIX_RD=	bsdmix.rd
 IMAGE=		mr.fs
 CBIN?=		instbin
 LISTS=		${.CURDIR}/list
@@ -31,7 +32,7 @@ all ${IMAGE}:
 	@false
 .else
 
-all:	${BSD_RD} ${BSDOFW_RD}
+all:	${BSD_RD} ${BSDOFW_RD} ${BSDMIX_RD}
 
 ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
 	cp bsd ${BSD_RD}
@@ -41,21 +42,31 @@ ${BSDOFW_RD}: ${CBIN} ${IMAGE} bsdofw rdsetroot
 	cp bsdofw ${BSDOFW_RD}
 	${.OBJDIR}/rdsetroot ${BSDOFW_RD} < ${IMAGE}
 
+${BSDMIX_RD}: ${CBIN} ${IMAGE} bsdmix rdsetroot
+	cp bsdmix ${BSDMIX_RD}
+	${.OBJDIR}/rdsetroot ${BSDMIX_RD} < ${IMAGE}
+
 ${IMAGE}: rd_setup do_files rd_teardown
 
 .endif
 
+bsd:
+	cd ${.TOP}/../../sys/arch/powerpc/conf && config RAMDISK
+	cd ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK && \
+	    make clean && make
+	cp ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK/bsd bsd
+
 bsdofw:
 	cd ${.TOP}/../../sys/arch/powerpc/conf && config RAMDISKOFW
 	cd ${.TOP}/../../sys/arch/powerpc/compile/RAMDISKOFW && \
 	    make clean && make
 	cp ${.TOP}/../../sys/arch/powerpc/compile/RAMDISKOFW/bsd bsdofw
 
-bsd:
-	cd ${.TOP}/../../sys/arch/powerpc/conf && config RAMDISK
-	cd ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK && \
+bsdmix:
+	cd ${.TOP}/../../sys/arch/powerpc/conf && config RAMDISKMIX
+	cd ${.TOP}/../../sys/arch/powerpc/compile/RAMDISKMIX && \
 	    make clean && make
-	cp ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK/bsd bsd
+	cp ${.TOP}/../../sys/arch/powerpc/compile/RAMDISKMIX/bsd bsdmix
 
 rd_setup: 
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
@@ -82,6 +93,7 @@ unconfig:
 install:
 	cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD}
 	cp ${BSDOFW_RD} ${DESTDIR}/snapshot/${BSDOFW_RD}
+	cp ${BSDMIX_RD} ${DESTDIR}/snapshot/${BSDMIX_RD}
 
 ${CBIN}.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
@@ -99,7 +111,8 @@ do_files:
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
-	*.o *.lo *.c bsd ${BSD_RD} ${BSD_RD}.elf rdsetroot
+	*.o *.lo *.c bsd ${BSD_RD} ${BSDOFW_RD} ${BSDMIX_RD} ${BSD_RD}.elf \
+	rdsetroot
 
 beforeinstall:
 	cp ${BSD.RD} ${DESTDIR}/snapshot
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
index d8d3ca4f474..80dc75513d5 100644
--- a/distrib/powerpc/ramdisk/list
+++ b/distrib/powerpc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.6 1998/08/07 01:35:30 rahnds Exp $
+#	$OpenBSD: list,v 1.7 1998/09/09 04:32:57 rahnds Exp $
 
 SRCDIRS distrib/special
 SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -100,6 +100,6 @@ COPY	install.md			install.md
 COPY	install.sh			install
 #COPY	${CURDIR}/../../miniroot/install.sh		install
 COPY	${CURDIR}/../../miniroot/upgrade.sh		upgrade
-SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
-#SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+#SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
+SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
 SPECIAL	chmod 755 install