From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Sep 2010 20:32:53 +0000 (+0200)
Subject: tmpfiles: install default tmpfiles configuration
X-Git-Tag: v11~38
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=34c8deaae1fcfa9e7c9db49b5f3a33973e103218;ds=sidebyside

tmpfiles: install default tmpfiles configuration
---

diff --git a/Makefile.am b/Makefile.am
index 44a2779f0..973d341ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 sessionunitdir=$(pkgdatadir)/session
+tmpfilesdir=$(sysconfdir)/tmpfiles.d
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -139,6 +140,10 @@ dbusinterface_DATA = \
 	org.freedesktop.systemd1.Swap.xml \
 	org.freedesktop.systemd1.Path.xml
 
+dist_tmpfiles_DATA = \
+	tmpfiles.d/systemd.conf \
+	tmpfiles.d/x11.conf
+
 dist_systemunit_DATA = \
 	units/emergency.service \
 	units/emergency.target \
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
new file mode 100644
index 000000000..ee326f082
--- /dev/null
+++ b/tmpfiles.d/systemd.conf
@@ -0,0 +1,10 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+d /var/lock/subsys 0755 root root
+d /var/run/user 0755 root root
+f /var/run/utmp 0664 root utmp
diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf
new file mode 100644
index 000000000..d23c052de
--- /dev/null
+++ b/tmpfiles.d/x11.conf
@@ -0,0 +1,9 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+d /tmp/.X11-unix 1777 root root
+d /tmp/.ICE-unix 1777 root root