use single shared mtree.conf

2 files changed, 2 insertions, 107 deletions

diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc
index 02285d49fa9..76efa53291a 100644
--- a/distrib/hp300/ramdisk/Makefile.inc
+++ b/distrib/hp300/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.3 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2002/04/28 18:28:33 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
 #
 
@@ -13,7 +13,7 @@ MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 LISTS=		${.CURDIR}/list
 CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
diff --git a/distrib/hp300/ramdisk/mtree.conf b/distrib/hp300/ramdisk/mtree.conf
deleted file mode 100644
index 419ded2f682..00000000000
--- a/distrib/hp300/ramdisk/mtree.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-#	$OpenBSD: mtree.conf,v 1.4 2002/03/03 00:43:37 krw Exp $
-#	$NetBSD: mtree.conf,v 1.1 1995/07/18 04:13:24 briggs 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
-..