From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 17 Jul 2014 11:28:29 +0000 (+0000)
Subject: No more /var/db/sysmerge
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bde0810f8bb88941af494580671176bef3bf0907;p=openbsd

No more /var/db/sysmerge
---

diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 6eb47c8d79c..476f3076f0c 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.258 2014/07/16 13:46:30 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.259 2014/07/17 11:28:29 ajacoutot Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -741,8 +741,6 @@ var
         ..
         pkg
         ..
-        sysmerge
-        ..
         yubikey			uname=root gname=auth mode=0770
         ..
     ..