Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.852
diff -u -r1.852 Makefile
--- Makefile	16 Aug 2004 08:56:50 -0000	1.852
+++ Makefile	16 Aug 2004 10:26:02 -0000
@@ -210,6 +210,11 @@
 MFSSIZE=		4096
 MFSINODE=		8192
 MFSLABEL=		auto
+.elif ${TARGET_ARCH} == "powerpc"
+DISKLABEL=		""
+MFSSIZE=		4096
+MFSINODE=		8192
+MFSLABEL=		auto
 .endif
 
 .if exists(/sbin/bsdlabel)
@@ -706,7 +711,7 @@
 	-test -f ${.CURDIR}/install.cfg \
 	    && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
 	@mkdir -p ${RD}/mfsfd/boot
-.if ${TARGET_ARCH} != "ia64"
+.if ${TARGET_ARCH} != "ia64" && ${TARGET_ARCH} != "powerpc"
 	@cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
 .endif
 .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
Index: scripts/doFS.sh
===================================================================
RCS file: /home/ncvs/src/release/scripts/doFS.sh,v
retrieving revision 1.58
diff -u -r1.58 doFS.sh
--- scripts/doFS.sh	9 Aug 2004 01:42:32 -0000	1.58
+++ scripts/doFS.sh	11 Aug 2004 04:46:49 -0000
@@ -73,10 +73,14 @@
 
 	trap "umount ${MNT}; mdconfig -d -u ${MDDEVICE}" EXIT
 
-	${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL}
-	newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c
-
-	mount /dev/${MDDEVICE}c ${MNT}
+	if [ "x${DISKLABEL}" != "x" ] ; then
+		${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL}
+		newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c
+		mount /dev/${MDDEVICE}c ${MNT}
+	else
+		newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}
+		mount /dev/${MDDEVICE} ${MNT}
+	fi
 }
 
 rm -f ${FSIMG}