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/05 07:59:15
@@ -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/05 07:59:15
@@ -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: distrib/utils/sysinst/arch/vax/md.h
===================================================================
RCS file: /cvsroot/basesrc/distrib/utils/sysinst/arch/vax/md.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 md.h
--- md.h	2000/03/01 12:38:49	1.1.2.2
+++ md.h	2000/03/05 07:59:28
@@ -61,7 +61,7 @@
     {"text",	1, NULL, "Text tools   : "},
     {"xbase",	1, NULL, "X11 clients  : "},
     {"xfont",	1, NULL, "X11 fonts    : "},
-    {"xserver",	1, NULL, "X11 servers  : "},
+/*    {"xserver",	1, NULL, "X11 servers  : "}, */ /* not built, 1.4.2 */
     {"xcontrib",1, NULL, "X11 contrib  : "},
     {"xcomp",	1, NULL, "X programming: "},
     {NULL, 0, NULL, NULL }
Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xc/config/cf/NetBSD.cf,v
retrieving revision 1.66
diff -u -r1.66 NetBSD.cf
--- NetBSD.cf	2000/03/01 12:12:40	1.66
+++ NetBSD.cf	2000/03/05 08:22:43
@@ -20,7 +20,7 @@
 XCOMM		NetBSD/alpha	client/server
 XCOMM		NetBSD/arm32	client/server
 XCOMM		NetBSD/atari	client/server
-XCOMM		NetBSD/vax	client/server
+XCOMM		NetBSD/vax	client (experimental server disabled)
 XCOMM		NetBSD/pc532	client
 XCOMM		NetBSD/x68k	client/server
 XCOMM		NetBSD/macppc	client/server
@@ -618,7 +618,7 @@
  * Definitions for the NetBSD/vax server.
  */
 #ifdef VaxArchitecture
-# define XvaxMonoServer YES
+# define XvaxMonoServer NO
 # if HasGcc
 #  define BuildPexExt XvaxMonoServer
 # else
Index: src/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/vax/conf/GENERIC
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/vax/conf/GENERIC,v
retrieving revision 1.45
diff -u -r1.45 GENERIC
--- GENERIC	1999/03/26 22:04:07	1.45
+++ GENERIC	2000/03/17 00:54:56
@@ -44,7 +44,7 @@
 file-system 	NULLFS
 file-system 	PROCFS
 file-system 	UMAPFS
-file-system 	UNION
+#file-system 	UNION
 file-system 	CD9660
 
 options 	QUOTA