use single shared mtree.conf

2 files changed, 2 insertions, 104 deletions

diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 6d168f2c0a8..007a1c1b5c3 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2002/04/28 18:28:33 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -11,7 +11,7 @@ LISTS?=		${.CURDIR}/../common/list ${.CURDIR}
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/../common/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
 FS?=		${XNAME}${REV}.fs
diff --git a/distrib/i386/common/mtree.conf b/distrib/i386/common/mtree.conf
deleted file mode 100644
index 932a161b2be..00000000000
--- a/distrib/i386/common/mtree.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-
-# ./etc/ppp
-ppp
-# ./etc/ppp
-..
-
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp             mode=01777
-# ./tmp
-..
-
-# ./usr
-usr
-
-# ./usr/bin
-bin
-# ./usr/bin
-..
-
-# ./usr/mdec
-mdec
-# ./usr/mdec
-..
-
-# ./usr/sbin
-sbin
-# ./usr/sbin
-..
-
-# ./usr/share
-share
-
-# ./usr/share/misc
-misc
-# ./usr/share/misc
-..
-
-# ./usr/share
-..
-
-# ./usr
-..
-
-# ./var
-var
-
-# ./var/tmp
-tmp		mode=01777
-
-# ./var/tmp
-..
-
-# ./var/db
-db
-
-# ./var/db
-..
-
-# ./var/run
-run
-
-# ./var/run
-..
-
-# ./var
-..