Index: distrib/macppc/floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/basesrc/distrib/macppc/floppies/ramdisk/Makefile,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 Makefile
--- Makefile	2000/03/01 00:12:22	1.4.2.3
+++ Makefile	2000/03/04 04:30:50
@@ -20,15 +20,22 @@
 CRUNCHCONF=	${CBIN}.conf
 MTREE=		mtree.conf
 
-SIZE=		1600k
-GEOM=		512/16/2/100
+CYLS=		100
+SECS=		16
+TRKS=		2
+TOTALSECT !=	expr ${CYLS} '*' ${SECS} '*' ${TRKS}
 DISKTYPE=	floppyinstfs
+DISKTAB=	./${DISKTYPE}.disktab
+GEOM=		512/${SECS}/${TRKS}/${CYLS}
+INO_BYTES=	6144
 
 all: ${CBIN} 
-	dd if=/dev/zero of=${IMAGE} bs=${SIZE} count=1
-	vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
-	disklabel -rw ${VND_CDEV} ${DISKTYPE}
-	newfs -B be -m 0 -o space -i 4096 -c 100 ${VND_RDEV}
+	dd if=/dev/zero of=${IMAGE} bs=512 count=${TOTALSECT}
+	vnconfig -v -c ${VND_CDEV} ${IMAGE} ${GEOM}
+	echo "${DISKTYPE}:ty=floppy:se#512:nt#${TRKS}:rm#300:ns#${SECS}:nc#${CYLS}:pa#${TOTALSECT}:oa#0:ba#4096:fa#512:ta=4.2BSD:pc#${TOTALSECT}:oc#0:" > ${DISKTAB}
+	disklabel -rw -f ${DISKTAB} ${VND_CDEV} ${DISKTYPE}
+	disklabel -W ${VND_CDEV}
+	newfs -B be -m 0 -o space -i ${INO_BYTES} -c ${CYLS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
Index: distrib/notes/Makefile
===================================================================
RCS file: /cvsroot/basesrc/distrib/notes/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	1999/01/13 07:30:01	1.10
+++ Makefile	2000/03/04 04:30:50
@@ -1,5 +1,7 @@
 #	$NetBSD: Makefile,v 1.10 1999/01/13 07:30:01 ross Exp $
 
+TARGETS+=release
+
 .ifndef ALLNOTES
 SUBDIR = ${MACHINE}
 .else
Index: distrib/notes/Makefile.inc
===================================================================
RCS file: /cvsroot/basesrc/distrib/notes/Makefile.inc,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 Makefile.inc
--- Makefile.inc	2000/02/10 21:39:30	1.4.2.2
+++ Makefile.inc	2000/03/04 04:30:50
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4.2.2 2000/02/10 21:39:30 he Exp $
+#	$NetBSD: Makefile.inc,v 1.9 1999/12/07 22:56:57 soren Exp $
 
 # Ross Harvey <ross@netbsd.org>
 
@@ -12,14 +12,16 @@
 SRCS=	${MAIN} whatis contents hardware xfer prep install\
 	upgrade donations legal.common legal postinstall ../Makefile.inc\
 	${MERGED_SRCS}
+ICMD=	${INSTALL} ${RENAME} ${PRESERVE} ${COPY}	\
+	-o root -g wheel -m ${NONBINMODE} 
 
 PRESET=	${GFLAGS} -dV=$V -dV_S=${V_S} -dMACHINE=$M -d.CURDIR=${.CURDIR} -r$M=1 
 
-POST_PLAIN= -P-b -P-u -P-o -Tascii
+POST_PLAIN= -P-b -P-u -P-o
 
 ARGS_PS=	${PRESET} -dformat=PostScript
-ARGS_TXT=	${PRESET} -dformat=ASCII ${POST_PLAIN}
-ARGS_HTML=	${PRESET} -dformat=HTML  ${POST_PLAIN} -ww
+ARGS_TXT=	${PRESET} -dformat=ASCII ${POST_PLAIN} -Tascii
+ARGS_HTML=	${PRESET} -dformat=HTML ${POST_PLAIN} -Tlatin1 -ww
 ARGS_MORE=	${PRESET} -dformat=more -P-h -Tascii
 
 #
@@ -52,6 +54,17 @@
 
 echomore!
 	@echo ${.OBJDIR}/${TARG}.more
+
+.ifndef RELEASEDIR
+release:
+	@echo setenv RELEASEDIR first
+	@false
+.else
+release:
+.for i in ${TARGS}
+	${ICMD} ${i} ${RELEASEDIR}/.
+.endfor
+.endif
 
 .PATH: ${.CURDIR}/../common
 
Index: sys/ufs/lfs/lfs_vfsops.c
===================================================================
RCS file: /cvsroot/syssrc/sys/ufs/lfs/lfs_vfsops.c,v
retrieving revision 1.28.2.6
diff -u -r1.28.2.6 lfs_vfsops.c
--- lfs_vfsops.c	2000/01/20 21:11:46	1.28.2.6
+++ lfs_vfsops.c	2000/03/13 12:19:57
@@ -82,6 +82,7 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
+#include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/file.h>
 #include <sys/disklabel.h>
@@ -164,6 +165,11 @@
 	struct proc *p = curproc;	/* XXX */
 	int error;
 	
+	if (root_device->dv_class != DV_DISK)
+		return (ENODEV);
+
+	if (rootdev == NODEV)
+	  	return (ENODEV);
 	/*
 	 * Get vnodes for swapdev and rootdev.
 	 */
Index: sys/arch/macppc/conf/GENERIC
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/macppc/conf/GENERIC,v
retrieving revision 1.27.2.1
diff -u -r1.27.2.1 GENERIC
--- GENERIC	1999/05/06 20:07:04	1.27.2.1
+++ GENERIC	2000/03/16 10:32:19
@@ -52,7 +52,7 @@
 file-system 	PORTAL		# portal filesystem (still experimental)
 file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
-file-system 	UNION		# union file system
+#file-system 	UNION		# union file system
 
 # File system options
 options 	QUOTA		# UFS quotas