summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@suse.com>2017-10-06 01:28:19 +0200
committerLennart Poettering <lennart@poettering.net>2017-10-06 01:28:19 +0200
commit4a1f92c704aad80e9fde3f3d1678a5e5e944ae47 (patch)
tree0e9b9d5ff3f163b4b03d5f47e6b7fff98c3eb4af
parent91277dff730769905754c137dcfcca579dea388d (diff)
downloadsystemd-4a1f92c704aad80e9fde3f3d1678a5e5e944ae47.tar.gz
tmpfiles: remove old ICE and X11 sockets at boot (#6979)
tmpfiles: remove old ICE and X11 sockets at boot When not using tmpfs based /tmp, leftover sockets might prevent X startup. Ensure directory is clean at boot time.
-rw-r--r--tmpfiles.d/x11.conf11
1 files changed, 6 insertions, 5 deletions
diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf
index 4c96a54a13..f63184eaa6 100644
--- a/tmpfiles.d/x11.conf
+++ b/tmpfiles.d/x11.conf
@@ -8,11 +8,12 @@
# See tmpfiles.d(5) for details
# Make sure these are created by default so that nobody else can
-d /tmp/.X11-unix 1777 root root 10d
-d /tmp/.ICE-unix 1777 root root 10d
-d /tmp/.XIM-unix 1777 root root 10d
-d /tmp/.font-unix 1777 root root 10d
-d /tmp/.Test-unix 1777 root root 10d
+# or empty them at startup
+D! /tmp/.X11-unix 1777 root root 10d
+D! /tmp/.ICE-unix 1777 root root 10d
+D! /tmp/.XIM-unix 1777 root root 10d
+D! /tmp/.font-unix 1777 root root 10d
+D! /tmp/.Test-unix 1777 root root 10d
# Unlink the X11 lock files
r! /tmp/.X[0-9]*-lock