Index: distrib/i386/floppies/bootfloppy-common/Makefile.inc
===================================================================
RCS file: /cvsroot/basesrc/distrib/i386/floppies/bootfloppy-common/Makefile.inc,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 Makefile.inc
--- Makefile.inc	1999/11/11 21:05:58	1.18.2.1
+++ Makefile.inc	2000/03/04 04:30:48
@@ -65,9 +65,9 @@
 	mv netbsd.tmp.gz ${.TARGET}
 
 release:
-	-mkdir -p ${RELEASEDIR}/installation/floppies
-	cp -p ${IMAGE} ${RELEASEDIR}/installation/floppies
-	gzip <${IMAGE} >${RELEASEDIR}/installation/floppies/${IMAGE}.gz
+	-mkdir -p ${RELEASEDIR}/installation/floppy
+	cp -p ${IMAGE} ${RELEASEDIR}/installation/floppy
+	gzip -c -9 <${IMAGE} >${RELEASEDIR}/installation/floppy/${IMAGE}.gz
 
 clean cleandir distclean:
 	/bin/rm -f *.core ${IMAGE} ${CLEANFILES}
Index: distrib/i386/floppies/fdset-common/Makefile.inc
===================================================================
RCS file: /cvsroot/basesrc/distrib/i386/floppies/fdset-common/Makefile.inc,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 Makefile.inc
--- Makefile.inc	1999/11/11 21:06:32	1.5.2.1
+++ Makefile.inc	2000/03/04 04:30:48
@@ -106,9 +106,9 @@
 	strip boot
 
 release:
-	-mkdir -p ${RELEASEDIR}/installation/floppies
-	cp -p ${BASENAME}?.fs ${RELEASEDIR}/installation/floppies
-	for f in ${RELEASEDIR}/installation/floppies/${BASENAME}?.fs; do \
+	-mkdir -p ${RELEASEDIR}/installation/floppy
+	cp -p ${BASENAME}?.fs ${RELEASEDIR}/installation/floppy
+	for f in ${RELEASEDIR}/installation/floppy/${BASENAME}?.fs; do \
 		gzip <$$f >$$f.gz; \
 	done
 	
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/i386/conf/GENERIC
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.231.2.8
diff -u -r1.231.2.8 GENERIC
--- GENERIC	2000/01/31 18:53:19	1.231.2.8
+++ GENERIC	2000/03/16 10:27:44
@@ -101,7 +101,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	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options