summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--TODO2
-rw-r--r--configure.ac1
-rw-r--r--tmpfiles.d/legacy.conf21
-rw-r--r--tmpfiles.d/systemd.conf3
5 files changed, 29 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 7f8e22a6a3..12118b1cc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,6 +207,11 @@ dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/x11.conf
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+ tmpfiles.d/legacy.conf
+endif
+
dist_systemunit_DATA = \
units/graphical.target \
units/multi-user.target \
diff --git a/TODO b/TODO
index 651e646d35..12634744b8 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,8 @@ F15:
Features:
+* take BSD file lock on tty devices when using them?
+
* tmpfiles should allow two identical lines
https://bugzilla.redhat.com/show_bug.cgi?id=690253
diff --git a/configure.ac b/configure.ac
index 58493511f7..0821e72355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,6 +411,7 @@ AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
AM_CONDITIONAL(HAVE_PLYMOUTH, test -n "$have_plymouth")
+AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
AC_ARG_WITH([dbuspolicydir],
AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
new file mode 100644
index 0000000000..fff2779e6d
--- /dev/null
+++ b/tmpfiles.d/legacy.conf
@@ -0,0 +1,21 @@
+# 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.
+
+# See tmpfiles.d(5) for details
+
+# These files are considered legacy and are unnecessary on legacy-free
+# systems. /run/lock/subsys is used for serializing SysV service
+# execution, and hence without use on SysV-less systems.
+#
+# /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/subsys 0755 root root -
+d /run/lock/lockdev 0775 root lock -
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 31fd97f0ba..ab6f20116e 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -8,9 +8,6 @@
# See tmpfiles.d(5) for details
d /run/lock 0755 root root -
-d /run/lock/subsys 0755 root root -
-d /run/lock/lockdev 0775 root lock -
-
d /run/user 0755 root root 10d
F /run/utmp 0664 root utmp -