From 66db7666c3d1482a3691db3e48f7c2cf4bf39ded Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 16 Jul 2014 14:19:37 +0000
Subject: [PATCH] convert to new readable format; requesting post-commit review
 by ingo

---
 distrib/miniroot/mtree.conf | 125 ++++++++----------------------------
 1 file changed, 26 insertions(+), 99 deletions(-)

diff --git a/distrib/miniroot/mtree.conf b/distrib/miniroot/mtree.conf
index 9b2a48fd1f1..753a8947248 100644
--- a/distrib/miniroot/mtree.conf
+++ b/distrib/miniroot/mtree.conf
@@ -1,121 +1,48 @@
-#	$OpenBSD: mtree.conf,v 1.15 2014/02/21 19:14:23 deraadt Exp $
+#	$OpenBSD: mtree.conf,v 1.16 2014/07/16 14:19:37 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
-# .
+
 .
 
-# ./bin
 bin
-# ./bin
 ..
-
-# ./dev
 dev
-# ./dev
 ..
-
-# ./etc
 etc
-
-### This is only needed by some of the architectures
-# ./etc/ppp
-ppp
-# ./etc/ppp
-..
-
-# ./etc/firmware
-firmware
-# ./etc/firmware
+    firmware
+    ..
+    signify
+    ..
 ..
-
-# ./etc/signify
-signify
-# ./etc/signify
-..
-
-# ./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
-..
-
-### This is only needed by some of the architectures
-# ./usr/share/keymaps
-keymaps
-# ./usr/share/keymaps
+    bin
+    ..
+    mdec
+    ..
+    sbin
+    ..
+    share
+        keymaps
+        ..
+        misc
+        ..
+    ..
 ..
-
-# ./usr/share
-..
-
-# ./usr
-..
-
-# ./var
 var
-
-# ./var/tmp
-tmp		mode=01777
-# ./var/tmp
-..
-
-# ./var/db
-db
-# ./var/db
-..
-
-# ./var/run
-run
-# ./var/run
-..
-
-# ./var/empty
-empty
-# ./var/empty
-..
-
-# ./var
+    db
+    ..
+    empty
+    ..
+    tmp		mode=01777
+    ..
+    run
+    ..
 ..
-- 
2.20.1