summaryrefslogtreecommitdiff
path: root/etc/mtree
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-08-24 10:42:09 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-08-24 10:42:09 +0000
commit4048c8c4e1ebc98383a10f648faff317703ea60d (patch)
tree7204731bbd461ad6dfed60387dd6c0818c74a096 /etc/mtree
parent979096f1657eabe75d4fca4b726e2560d184c428 (diff)
/usr/share/sysmerge -> /var/sysmerge
requested by several discussed with deraadt@
Diffstat (limited to 'etc/mtree')
-rw-r--r--etc/mtree/4.4BSD.dist10
-rw-r--r--etc/mtree/BSD.x11.dist8
2 files changed, 8 insertions, 10 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 4532951c794..2e222e26e47 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.272 2015/07/21 04:06:04 yasuoka Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.273 2015/08/24 10:41:11 ajacoutot Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -622,10 +622,6 @@ usr
..
..
- # ./usr/share/sysmerge
- sysmerge
- ..
-
# ./usr/share/tabset
tabset
..
@@ -753,6 +749,10 @@ var
run
..
+ # ./var/sysmerge
+ sysmerge uname=root gname=wheel mode=0700
+ ..
+
# ./var/spool
spool
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index 3523fb29203..de30d75acca 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: BSD.x11.dist,v 1.38 2015/04/15 07:41:53 jsg Exp $
+# $OpenBSD: BSD.x11.dist,v 1.39 2015/08/24 10:41:11 ajacoutot Exp $
/set type=dir uname=root gname=wheel mode=0755
.
@@ -417,10 +417,6 @@
..
..
..
- share
- sysmerge
- ..
- ..
..
var
cache
@@ -433,5 +429,7 @@
..
log
..
+ sysmerge uname=root gname=wheel mode=0700
+ ..
..
..