Merge pull request #2491 from martinpitt/master

tmpfiles: drop /run/lock/lockdev

3 files changed, 13 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 539093616e..ee12437868 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 systemd System and Service Manager
 
+CHANGES WITH 229:
+
+        * Creation of the legacy /run/lock/lockdev/ directory was
+          dropped from tmpfiles.d/legacy.conf. Hardly any software uses
+          that any more, and better locking mechanisms like flock() have
+          been available for many years. If you still need this, you need to
+          create your own tmpfiles.d config file with:
+            d /run/lock/lockdev 0775 root lock -
+
+        Contributions from: ...
+
+        -- Berlin, 2016-MM-DD
+
 CHANGES WITH 228:
 
         * A number of properties previously only settable in unit
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
index 823d6cb200..b2dc5ebd4f 100644
--- a/sysusers.d/basic.conf.in
+++ b/sysusers.d/basic.conf.in
@@ -19,7 +19,6 @@ g wheel   -     -            -
 
 # Access to certain kernel and userspace facilities
 g kmem    -     -            -
-g lock    -     -            -
 g tty     @TTY_GID@     -            -
 g utmp    -     -            -
 
diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
index 3cb0c63815..62e2ae0986 100644
--- a/tmpfiles.d/legacy.conf
+++ b/tmpfiles.d/legacy.conf
@@ -18,14 +18,6 @@ L /var/lock - - - - ../run/lock
 
 d /run/lock/subsys 0755 root root -
 
-# /run/lock/lockdev is used to serialize access to tty devices via
-# LCK..xxx style lock files, For more information see:
-# http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
-# On modern systems a BSD file lock is a better choice if
-# serialization is needed on those devices.
-
-d /run/lock/lockdev 0775 root lock -
-
 # /forcefsck, /fastboot and /forcequotacheck are deprecated in favor of the
 # kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
 # 'quotacheck.mode=force'