summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-09-03 15:07:32 +0200
committerTom Gundersen <teg@jklm.no>2012-10-23 21:53:20 +0200
commita2558205f762ce6f1374cea0eedf5e76a6134f41 (patch)
treedbb94844d49ba549d5b2a305497b533c40997ccd
parent1cb88f2c61f590083847d65cd5a518e834da87d3 (diff)
tmpfiles: allow Age to be set to 0
Mostly useful for testing purposes. Setting Age to 1s works just as well, but it is surprising that using 0s (or just 0) does not work. Also clarify this in the documentation.
-rw-r--r--man/tmpfiles.d.xml7
-rw-r--r--src/tmpfiles/tmpfiles.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index a86ef33695..86fa4394c0 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -265,7 +265,12 @@ L /tmp/foobar - - - - /dev/null</programlisting>
</variablelist>
<para>If multiple integers and units are specified the time
- values are summed up.</para>
+ values are summed up. If an integer is given witohut a unit,
+ s is assumed.
+ </para>
+
+ <para>When the age is set to zero, the files are cleaned
+ unconditionally.</para>
<para>The age field only applies to lines starting with
d, D and x. If omitted or set to - no automatic clean-up
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index c32cbd1aea..c27d0112f9 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -409,7 +409,7 @@ static int clean_item(Item *i) {
i->type != IGNORE_PATH)
return 0;
- if (!i->age_set || i->age <= 0)
+ if (!i->age_set)
return 0;
n = now(CLOCK_REALTIME);