summaryrefslogtreecommitdiff
path: root/distrib/mac68k
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-04-28 18:28:35 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-04-28 18:28:35 +0000
commitfd34c08077aafc9f0097ca6553da0fe6e3cbd5b8 (patch)
tree53ced2298a7bbcd673406c4328eaef953ee11c16 /distrib/mac68k
parent24d3d0ab5057c580bca15da49d0d51517469d04b (diff)
use single shared mtree.conf
Diffstat (limited to 'distrib/mac68k')
-rw-r--r--distrib/mac68k/ramdisk/Makefile4
-rw-r--r--distrib/mac68k/ramdisk/Makefile.inc4
-rw-r--r--distrib/mac68k/ramdisk/mtree.conf82
3 files changed, 4 insertions, 86 deletions
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
-..