use single shared mtree.conf

30 files changed, 57 insertions, 1215 deletions

diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc
index 02dd5206fc1..dd2d7942150 100644
--- a/distrib/alpha/inst-common/Makefile.inc
+++ b/distrib/alpha/inst-common/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.4 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2002/04/28 18:28:33 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
@@ -12,7 +12,7 @@ MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list ${.CURDIR}/../common/list
 CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
diff --git a/distrib/alpha/inst-common/mtree.conf b/distrib/alpha/inst-common/mtree.conf
deleted file mode 100644
index 3cca07b54f2..00000000000
--- a/distrib/alpha/inst-common/mtree.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#	$OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:37 deraadt Exp $
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp
-# ./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
-..
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
-..
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
-..
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
index d3770725f70..769e9491429 100644
--- a/distrib/mac68k/ramdisk/Makefile
+++ b/distrib/mac68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/04/25 22:10:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -11,7 +11,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 VND?=		svnd0
 VND_DEV=	/dev/${VND}a
diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc
index 0c17085647e..261aae7b996 100644
--- a/distrib/mac68k/ramdisk/Makefile.inc
+++ b/distrib/mac68k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.2 2002/04/24 22:33:41 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2002/04/28 18:28:34 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
 #
 
@@ -13,7 +13,7 @@ COMMONDIR=	${TOP}/ramdisk
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 RAWLABEL=	
 
 ${CBIN}.conf: ${LISTS}
diff --git a/distrib/mac68k/ramdisk/mtree.conf b/distrib/mac68k/ramdisk/mtree.conf
deleted file mode 100644
index 7476ca910ba..00000000000
--- a/distrib/mac68k/ramdisk/mtree.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#	$OpenBSD: mtree.conf,v 1.3 2002/04/24 22:33:41 miod 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
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp		mode=01777
-# ./tmp
-..
-
-# ./usr
-usr
-
-# ./usr/bin
-bin
-# ./usr/bin
-..
-
-# ./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
-..
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 53abcc8face..77ece42198b 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/04/28 18:28:34 deraadt Exp $
 
 REV=	${OSrev}
 
@@ -11,7 +11,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 VND?=		svnd0
 VND_DEV=	/dev/${VND}a
diff --git a/distrib/macppc/ramdisk/mtree.conf b/distrib/macppc/ramdisk/mtree.conf
deleted file mode 100644
index 82608136920..00000000000
--- a/distrib/macppc/ramdisk/mtree.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.2 2002/03/03 00:43:37 krw 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
-..
diff --git a/distrib/miniroot/mtree.conf b/distrib/miniroot/mtree.conf
index 68276735757..99893cc271e 100644
--- a/distrib/miniroot/mtree.conf
+++ b/distrib/miniroot/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.6 2001/06/23 19:44:46 deraadt Exp $
+#	$OpenBSD: mtree.conf,v 1.7 2002/04/28 18:28:34 deraadt Exp $
 #	$NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -17,6 +17,13 @@ dev
 
 # ./etc
 etc
+
+### This is only needed by some of the architectures
+# ./etc/ppp
+ppp
+# ./etc/ppp
+..
+
 # ./etc
 ..
 
@@ -66,6 +73,7 @@ misc
 # ./usr/share/misc
 ..
 
+### This is only needed by some of the architectures
 # ./usr/share/keymaps
 keymaps
 # ./usr/share/keymaps
@@ -80,5 +88,20 @@ keymaps
 # ./var
 var
 
-# ./
+# ./var/tmp
+tmp		mode=01777
+# ./var/tmp
+..
+
+# ./var/db
+db
+# ./var/db
+..
+
+# ./var/run
+run
+# ./var/run
+..
+
+# ./var
 ..
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index 8253bd6f60b..8fc71a4f747 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 VND?=		svnd0
 VND_DEV=	/dev/${VND}a
diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc
index 45706ac53b6..46d9c440e1b 100644
--- a/distrib/mvme68k/ramdisk/Makefile.inc
+++ b/distrib/mvme68k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.5 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2002/04/28 18:28:34 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
 #
 
@@ -13,7 +13,7 @@ COMMONDIR=	${TOP}/ramdisk
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 RAWLABEL=	
 
 ${CBIN}.conf: ${LISTS}
diff --git a/distrib/mvme68k/ramdisk/mtree.conf b/distrib/mvme68k/ramdisk/mtree.conf
deleted file mode 100644
index 88dd2001e18..00000000000
--- a/distrib/mvme68k/ramdisk/mtree.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.4 2002/04/17 01:59:57 deraadt Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-
-# ./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=0177
-
-# ./var/tmp
-..
-
-# ./var
-..
diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc
index 264d0e1c391..4d3643081f8 100644
--- a/distrib/mvme88k/ramdisk/Makefile.inc
+++ b/distrib/mvme88k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.2 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2002/04/28 18:28:34 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
@@ -12,7 +12,7 @@ MOUNT_POINT?=	${TOP}/${BASE}/fs
 
 LISTS=		${.CURDIR}/list
 CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 RAWLABEL=	
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
diff --git a/distrib/mvme88k/ramdisk/mtree.conf b/distrib/mvme88k/ramdisk/mtree.conf
deleted file mode 100644
index eaf11101c3f..00000000000
--- a/distrib/mvme88k/ramdisk/mtree.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#	$OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:50 deraadt Exp $
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp
-# ./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
-..
diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile
index 37ed6dff9c8..3a2d6ad9bdb 100644
--- a/distrib/mvmeppc/ramdisk/Makefile
+++ b/distrib/mvmeppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/04/28 09:42:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 VND?=		svnd0
 VND_DEV=	/dev/${VND}a
diff --git a/distrib/mvmeppc/ramdisk/mtree.conf b/distrib/mvmeppc/ramdisk/mtree.conf
deleted file mode 100644
index 704e43cd952..00000000000
--- a/distrib/mvmeppc/ramdisk/mtree.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.1 2001/06/26 22:23:26 smurph Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./kern
-kern
-# ./kern
-..
-
-# ./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=0177
-
-# ./var/tmp
-..
-
-# ./var/db
-db
-# ./var/db
-..
-
-# ./var
-..
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index ea0cc6a1c04..c8e04c39011 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2002/02/15 20:28:57 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.21 2002/04/28 18:28:34 deraadt Exp $
 
 REV=		${OSrev}
 
@@ -26,7 +26,7 @@ STRIP?=		strip
 RDSETROOT?=	rdsetroot
 
 LISTS=		${.CURDIR}/list ${ARCHDIR}/list
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 FLOPPY?=	floppy${REV}.fs
 FLOPPYSIZE?=	2880
diff --git a/distrib/ramdisk/mtree.conf b/distrib/ramdisk/mtree.conf
deleted file mode 100644
index f17d2174456..00000000000
--- a/distrib/ramdisk/mtree.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.4 2001/06/23 19:44:55 deraadt Exp $
-#	$NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-# ./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/db
-db
-# ./var/db
-..
-
-# ./
-..
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 92eeeedd57d..668d05cd777 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2002/04/26 00:25:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -22,7 +22,7 @@ STRIP?=		strip
 GZIP?=		gzip
 GZIPFLAGS?=	-9f
 INSTALLBOOT?=	/usr/mdec/installboot -v
-MTREE=		${.CURDIR}/../common/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 RAMDISK=	RAMDISK
 BOOT?=		/usr/mdec/boot
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 47000833ce3..02bbcf0ff48 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ LISTS?=		${.CURDIR}/list
 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/sparc64/common/mtree.conf b/distrib/sparc64/common/mtree.conf
deleted file mode 100644
index 82608136920..00000000000
--- a/distrib/sparc64/common/mtree.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.2 2002/03/03 00:43:37 krw 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
-..
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index a5efd966237..2be2c7d76a5 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 FLOPPY=		floppy${REV}.fs
 FLOPPYSIZE?=	2880
diff --git a/distrib/sparc64/ramdisk/mtree.conf b/distrib/sparc64/ramdisk/mtree.conf
deleted file mode 100644
index 82608136920..00000000000
--- a/distrib/sparc64/ramdisk/mtree.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.2 2002/03/03 00:43:37 krw 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
-..
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 85bbd35ac9e..87f02e69bc7 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/04/28 18:28:34 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
-MTREE=		${.CURDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 FLOPPY=		floppyB${REV}.fs
 FLOPPYSIZE?=	2880
diff --git a/distrib/sparc64/ramdiskB/mtree.conf b/distrib/sparc64/ramdiskB/mtree.conf
deleted file mode 100644
index 82608136920..00000000000
--- a/distrib/sparc64/ramdiskB/mtree.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.2 2002/03/03 00:43:37 krw 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
-..
diff --git a/distrib/vax/common/Makefile.inc b/distrib/vax/common/Makefile.inc
index 11f6c6ecdb9..07b13e1a619 100644
--- a/distrib/vax/common/Makefile.inc
+++ b/distrib/vax/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/04/25 22:10:28 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2002/04/28 18:28:34 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -16,7 +16,7 @@ MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
 CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+MTREE=		${UTILS}/mtree.conf
 
 all: ${CBIN} bootroot
 	dd if=/dev/zero of=${IMAGE} bs=64k count=32
diff --git a/distrib/vax/common/mtree.conf b/distrib/vax/common/mtree.conf
deleted file mode 100644
index 1fa6be687c2..00000000000
--- a/distrib/vax/common/mtree.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#	$OpenBSD: mtree.conf,v 1.1 2002/04/25 22:10:28 deraadt Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./etc
-etc
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp
-# ./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
-..