[systemd-commits] 3 commits - Makefile.am tmpfiles.d/systemd.conf tmpfiles.d/tmp.conf TODO

[Lennart Poettering]

 Makefile.am             |    1 +
 TODO                    |   10 ++++++++++
 tmpfiles.d/systemd.conf |    3 ---
 tmpfiles.d/tmp.conf     |   12 ++++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit c821bd28c2ecce8d35248d61949fe1c0c3030b6c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Aug 24 21:22:26 2011 +0200

    update TODO

diff --git a/TODO b/TODO
index 8c6576f..5e4d749 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,8 @@ Bugfixes:
 
 Features:
 
+* something like ConditionExec= or ExecStartPre= without failure state
+
 * service restart retry configuration
 
 * tmpfiles: apply "x" on "D" too (see patch from William Douglas

commit 7d441ddb5ca090b5a97f58ac4b4d97b3e84fa81e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Aug 24 21:14:28 2011 +0200

    update TODO

diff --git a/TODO b/TODO
index 3074454..8c6576f 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,14 @@ Bugfixes:
 * make sure timeouts are applied to Type=oneshot services.
 
 Features:
+
+* service restart retry configuration
+
+* tmpfiles: apply "x" on "D" too (see patch from William Douglas
+* tmpfiles: support generation of char/block devices, symlinks and one-line files (think sysfs)
+
+* Introduce ControlGroupPersistant=yes to set +t on the tasks file when creating the cgroup
+
 * don't set $HOME in services unless requested
 
 * remove hacks in vala code and require libnotify 0.7

commit f08fce88206f7315cff24678590cd73cd5e75f95
Author: Josh Triplett <josh at joshtriplett.org>
Date:   Sat Aug 6 15:48:27 2011 -0700

    tmpfiles: Move /tmp and /var/tmp to a separate tmpfiles.d file to ease overrides via /etc
    
    Many people prefer to avoid clearing /tmp and /var/tmp, and
    distributions often have explicit settings for how often to clear them
    if at all.  Overriding those with systemd currently requires overriding
    all of /usr/lib/tmpfiles.d/systemd.conf via
    /etc/tmpfiles.d/systemd.conf, copying across all the other entries, and
    updating that override when systemd.conf changes.
    
    Move the /tmp and /var/tmp entries from systemd.conf to a separate
    tmp.conf, making them easier to override without affecting the rest of
    systemd.conf.

diff --git a/Makefile.am b/Makefile.am
index ef3bd84..c1a4a5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -301,6 +301,7 @@ dist_bashcompletion_DATA = \
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
+	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf
 
 if HAVE_SYSV_COMPAT
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 7d4b356..be29c06 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -13,9 +13,6 @@ F /run/utmp 0664 root utmp -
 f /var/log/wtmp 0664 root utmp -
 f /var/log/btmp 0600 root utmp -
 
-d /tmp 1777 root root 10d
-d /var/tmp 1777 root root 30d
-
 d /var/cache/man - - - 30d
 
 r /forcefsck
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
new file mode 100644
index 0000000..8915b82
--- /dev/null
+++ b/tmpfiles.d/tmp.conf
@@ -0,0 +1,12 @@
+#  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
+
+# Clear tmp directories separately, to make them easier to override
+d /tmp 1777 root root 10d
+d /var/tmp 1777 root root 30d