Removed definition of _NEW_VFSCONF. The new vfsconf interface is now

the default.

30 files changed, 14 insertions, 43 deletions

diff --git a/bin/df/Makefile b/bin/df/Makefile
index bca8e35..d87f272 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/03/13 17:29:08 bde Exp $
+#	$Id: Makefile,v 1.6 1997/08/07 21:30:59 steve Exp $
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 
 PROG=	df
@@ -7,7 +7,7 @@ BINGRP=	operator
 BINMODE=2555
 
 MOUNT=	${.CURDIR}/../../sbin/mount
-CFLAGS+= -I${MOUNT} -D_NEW_VFSCONF
+CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index 4f9fdf0..4b8557a 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.5 1997/03/03 13:23:54 bde Exp $
+#	$Id: Makefile,v 1.6 1997/10/21 07:26:50 bde Exp $
 #
 
 PROG=	mount_msdos
@@ -7,7 +7,6 @@ SRCS=	mount_msdos.c getmntopts.c
 MAN8=	mount_msdos.8
 
 MOUNT=	${.CURDIR}/../../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 3913cfa..de20c83 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.13 1997/07/05 19:34:51 ache Exp $
+#	$Id: Makefile,v 1.14 1997/08/18 03:32:09 davidn Exp $
 
 PROG=	init
 MAN8=	init.8
 BINMODE=500
 INSTALLFLAGS=-fschg
-CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -D_NEW_VFSCONF
+CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP
 
 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 DISTRIBUTION=des
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index e05d5c7..df4ebcf 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,10 +1,9 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-#	$Id: Makefile,v 1.4 1997/08/24 21:02:46 steve Exp $
+#	$Id: Makefile,v 1.5 1997/08/25 20:38:35 bde Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
 MAN8=	mount.8
 # We do NOT install the getmntopts.3 man page.
-CFLAGS+=	-D_NEW_VFSCONF
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 61129f3..fc192a5 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_cd9660.c getmntopts.c
 MAN8=	mount_cd9660.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 9a463a4..cacee97 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_ext2fs.c getmntopts.c
 MAN8=	mount_ext2fs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_ifs/Makefile b/sbin/mount_ifs/Makefile
index e05d5c7..df4ebcf 100644
--- a/sbin/mount_ifs/Makefile
+++ b/sbin/mount_ifs/Makefile
@@ -1,10 +1,9 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-#	$Id: Makefile,v 1.4 1997/08/24 21:02:46 steve Exp $
+#	$Id: Makefile,v 1.5 1997/08/25 20:38:35 bde Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
 MAN8=	mount.8
 # We do NOT install the getmntopts.3 man page.
-CFLAGS+=	-D_NEW_VFSCONF
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_lfs/Makefile b/sbin/mount_lfs/Makefile
index bcd1f51..0020b8b 100644
--- a/sbin/mount_lfs/Makefile
+++ b/sbin/mount_lfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_lfs.c getmntopts.c
 MAN8=	mount_lfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index 4f9fdf0..4b8557a 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.5 1997/03/03 13:23:54 bde Exp $
+#	$Id: Makefile,v 1.6 1997/10/21 07:26:50 bde Exp $
 #
 
 PROG=	mount_msdos
@@ -7,7 +7,6 @@ SRCS=	mount_msdos.c getmntopts.c
 MAN8=	mount_msdos.8
 
 MOUNT=	${.CURDIR}/../../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 4f9fdf0..4b8557a 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.5 1997/03/03 13:23:54 bde Exp $
+#	$Id: Makefile,v 1.6 1997/10/21 07:26:50 bde Exp $
 #
 
 PROG=	mount_msdos
@@ -7,7 +7,6 @@ SRCS=	mount_msdos.c getmntopts.c
 MAN8=	mount_msdos.8
 
 MOUNT=	${.CURDIR}/../../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 090d37c..ebf516b 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_nfs.c getmntopts.c
 MAN8=	mount_nfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -DNFS -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_null/Makefile b/sbin/mount_null/Makefile
index 97f3c62..3f8b3ef 100644
--- a/sbin/mount_null/Makefile
+++ b/sbin/mount_null/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_null.c getmntopts.c
 MAN8=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 97f3c62..3f8b3ef 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_null.c getmntopts.c
 MAN8=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index fd0e416..af7d536 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id: Makefile,v 1.6 1997/02/22 14:32:52 peter Exp $
+#	$Id: Makefile,v 1.7 1997/03/11 12:34:55 peter Exp $
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
@@ -7,7 +7,6 @@ SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index fd0e416..af7d536 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id: Makefile,v 1.6 1997/02/22 14:32:52 peter Exp $
+#	$Id: Makefile,v 1.7 1997/03/11 12:34:55 peter Exp $
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
@@ -7,7 +7,6 @@ SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 91befcf..4085850 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -7,7 +7,6 @@ MLINKS=	mount_std.8 mount_devfs.8 mount_std.8 mount_fdesc.8 \
 	mount_std.8 mount_kernfs.8 mount_std.8 mount_procfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_umap/Makefile b/sbin/mount_umap/Makefile
index fce19db..780b52c 100644
--- a/sbin/mount_umap/Makefile
+++ b/sbin/mount_umap/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_umap.c getmntopts.c
 MAN8=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index fce19db..780b52c 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_umap.c getmntopts.c
 MAN8=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_union/Makefile b/sbin/mount_union/Makefile
index 6ac36c9..e213137 100644
--- a/sbin/mount_union/Makefile
+++ b/sbin/mount_union/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_union.c getmntopts.c
 MAN8=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 6ac36c9..e213137 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	mount_union.c getmntopts.c
 MAN8=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index c05730d..6a2097a 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,8 +1,7 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id: Makefile,v 1.6 1997/02/22 14:33:01 peter Exp $
+#	$Id: Makefile,v 1.7 1997/03/11 12:43:42 peter Exp $
 
 PROG=	mountd
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
 MAN5=	exports.5 netgroup.5
 MAN8=	mountd.8
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index d44fdba..7ad8c5a 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -5,7 +5,6 @@ SRCS=	dkcksum.c getmntopts.c newfs.c mkfs.c
 MAN8=	newfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DMFS -DFSIRAND -I${MOUNT}
 .PATH:	${MOUNT} ${.CURDIR}/../disklabel
 
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 6a144fa..12ce92e 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	nfsd
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DNFS
 MAN8=	nfsd.8
 DPADD+=	${LIBUTIL}
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 9928806..08d6157 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	nfsiod
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DNFS
 MAN8=	nfsiod.8
 
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index ec628cd..e2ea521 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -8,6 +8,4 @@ MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 
-CFLAGS+= -D_NEW_VFSCONF
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index af1ea26..c305d6a 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	find
 SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c
-CFLAGS+=-D_NEW_VFSCONF
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 377035a..85cb9fc 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -22,7 +22,6 @@ CFLAGS+=-DARCH_REP=\"${MACHINE}\"
 CFLAGS+=-DOS_REP=\"${OS}\"
 CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
 CFLAGS+=${CONFIG}
-CFLAGS+=-D_NEW_VFSCONF
 CLEANFILES+=vers.${PROG}.c vers.${PROG}.o version.amd
 CLEANFILES+=mount.h mount_xdr.c nfs_prot.h nfs_prot_xdr.c nfs_prot_svc.c
 RPCCOM = rpcgen
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index fd0e416..af7d536 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id: Makefile,v 1.6 1997/02/22 14:32:52 peter Exp $
+#	$Id: Makefile,v 1.7 1997/03/11 12:34:55 peter Exp $
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
@@ -7,7 +7,6 @@ SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
 .PATH:	${MOUNT}
 
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index c05730d..6a2097a 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,8 +1,7 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id: Makefile,v 1.6 1997/02/22 14:33:01 peter Exp $
+#	$Id: Makefile,v 1.7 1997/03/11 12:43:42 peter Exp $
 
 PROG=	mountd
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
 MAN5=	exports.5 netgroup.5
 MAN8=	mountd.8
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 6a144fa..12ce92e 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	nfsd
-CFLAGS+= -D_NEW_VFSCONF
 CFLAGS+=-DNFS
 MAN8=	nfsd.8
 DPADD+=	${LIBUTIL}