X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.timer.xml;h=6fc26a55366eab36094b3ff761618e366ffa35cc;hb=34511ca7b166b0e89d08ff9870b0cf2624a7815f;hp=7a4cd348877cf7e00bb778bf551a58ca7c459b80;hpb=b439c6ee04967fa988d232e0765f972cb27b1877;p=elogind.git
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 7a4cd3488..6fc26a553 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
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
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,7 +44,7 @@
systemd.timer
- systemd timer configuration files
+ Timer unit configuration
@@ -76,6 +76,17 @@
matching service foo.service. The
unit to activate may be controlled by
Unit= (see below).
+
+ Unless DefaultDependencies=
+ is set to , timer units will
+ implicitly have dependencies of type
+ Conflicts= and
+ Before= on
+ shutdown.target. These ensure
+ that timer units are stopped cleanly prior to system
+ shutdown. Only timer units involved with early boot or
+ late system shutdown should disable this
+ option.
@@ -88,27 +99,27 @@
- OnActive=
- OnBootup=
- OnStartup=
- OnUnitActive=
- OnUnitInactive=
+ OnActiveSec=
+ OnBootSec=
+ OnStartupSec=
+ OnUnitActiveSec=
+ OnUnitInactiveSec=Defines timers
relative to different starting points:
- OnActive= defines a
+ OnActiveSec= defines a
timer relative to the moment the timer
itself is
- activated. OnBootup=
+ activated. OnBootSec=
defines a timer relative to when the
machine was booted
- up. OnStartup=
+ up. OnStartupSec=
defines a timer relative to when
systemd was
- started. OnUnitActive=
+ started. OnUnitActiveSec=
defines a timer relative to when the
unit the timer is activating was last
- activated. OnUnitInactive=
+ activated. OnUnitInactiveSec=
defines a timer relative to when the
unit the timer is activating was last
deactivated.
@@ -116,8 +127,8 @@
Multiple directives may be
combined of the same and of different
types. For example, by combining
- OnBoot= and
- OnUnitActive= it is
+ OnBootSec= and
+ OnUnitActiveSec= it is
possible to define a timer that
elapses in regular intervals and
activates a specific service each
@@ -125,17 +136,17 @@
The arguments to the directives
are time spans configured in
- seconds. Example: "OnBoot=50" means
+ seconds. Example: "OnBootSec=50" means
50s after boot-up. The argument may
also include time units. Example:
- "OnBoot=5h 30min" means 5 hours and 30
+ "OnBootSec=5h 30min" means 5 hours and 30
minutes after boot-up. For details
about the syntax of time spans see
systemd.unit5.If a timer configured with
- OnBootup= or
- OnStartup= is
+ OnBootSec= or
+ OnStartupSec= is
already in the past when the timer
unit is activated, it will immediately
elapse and the configured unit is
@@ -159,10 +170,10 @@
specified, this value defaults to a
service that has the same name as the
timer unit, except for the
- suffix. (See above.) It is recommended,
+ suffix. (See above.) It is recommended
that the unit name that is activated
and the unit name of the timer unit
- are named identical, except for the
+ are named identically, except for the
suffix.
@@ -171,7 +182,7 @@
See Also
- systemd8,
+ systemd1,
systemctl8,
systemd.unit5,
systemd.service5