From f8cc06bea836ce3ee9fd2d6d192081ed1ada4029 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 30 Jul 2003 07:13:31 +0000
Subject: [PATCH] Moved the MFS root floppies creation code from release.10 to
 doMFSKERN (where it logically belongs).

---
 release/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index ba2c3e75790..92a6888397c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -757,16 +757,10 @@ release.10:
 .endif
 .if defined(BOOTSIZE)
 	@echo "Making the regular boot floppy."
-	@sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
-		${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \
-		${BOOTINODE} ${BOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
 .endif
 .if defined(SMALLBOOTSIZE)
 	@echo "Making the small boot floppy."
-	@sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
-		${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \
-		${BOOTINODE} ${SMALLBOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
 .endif
 .if defined(BIGBOOTSIZE)
@@ -1110,10 +1104,16 @@ doMFSKERN:
 		${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
 		${BOOTINODE} ${BIGBOOTLABEL}
 .elif defined(FDSIZE) && ${FDSIZE} == "SMALL"
+	sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
+		${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \
+		${BOOTINODE} ${SMALLBOOTLABEL}
 	sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \
 		${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/image.${FSIMAGE} \
 		${BOOTINODE} ${SMALLBOOTLABEL}
 .else
+	sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
+		${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \
+		${BOOTINODE} ${BOOTLABEL}
 	sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \
 		${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
 		${BOOTINODE} ${BOOTLABEL}