X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.timer.xml;h=55b458557f357634ae7f27591cbd8cddf7001e30;hb=3fb90db2d6aa6eb7711dbccb34a07e3e7ae85c91;hp=7143f9f931990e8bd269450f6ff2a7d8c5126b59;hpb=b040723ea412209e0edf54647fa5aa4287411507;p=elogind.git
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 7143f9f93..55b458557 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -78,15 +78,20 @@
Unit= (see below).
Unless DefaultDependencies=
- is set to , timer units will
+ is set to , all 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.
+ shutdown.target to ensure that
+ they are stopped cleanly prior to system shutdown.
+ Timer units with at least one
+ OnCalendar= directive will have an
+ additional After= dependency on
+ timer-sync.target to avoid
+ being started before the system clock has been
+ correctly set. Only timer units involved with early
+ boot or late system shutdown should disable the
+ DefaultDependencies= option.
@@ -165,8 +170,8 @@
assignments will have no
effect.
- Note that timers are not
- necessarily expired at the precise
+ Note that timers do not
+ necessarily expire at the precise
time configured with these settings,
as they are subject to the
AccuracySec=
@@ -187,8 +192,8 @@
OnActiveSec= and
related settings.
- Note that timers are not
- necessarily expired at the precise
+ Note that timers do not
+ necessarily expire at the precise
time configured with this setting,
as it is subject to the
AccuracySec=
@@ -201,7 +206,7 @@
Specify the accuracy
the timer shall elapse with. Defaults
to 1min. The timer is scheduled to
- expire within a time window starting
+ elapse within a time window starting
with the time specified in
OnCalendar=,
OnActiveSec=,
@@ -214,7 +219,7 @@
later. Within this time window, the
expiry time will be placed at a
host-specific, randomized but stable
- position, that is synchronized between
+ position that is synchronized between
all local timer units. This is done in
order to distribute the wake-up time
in networked installations, as well as
@@ -249,6 +254,43 @@
are named identically, except for the
suffix.
+
+
+
+ Persistent=
+
+ Takes a boolean
+ argument. If true, the time when the
+ service unit was last triggered is
+ stored on disk. When the timer is
+ activated, the service unit is
+ triggered immediately if it would have
+ been triggered at least once during
+ the time when the timer was inactive.
+ This is useful to catch up on missed
+ runs of the service when the machine
+ was off. Note that this setting only
+ has an effect on timers configured
+ with OnCalendar=.
+
+
+
+
+ WakeSystem=
+
+ Takes a boolean
+ argument. If true, an elapsing timer
+ will cause the system to resume from
+ suspend, should it be suspended and if
+ the system supports this. Note that
+ this option will only make sure the
+ system resumes on the appropriate
+ times, it will not take care of
+ suspending it again after any work
+ that is to be done is
+ finished. Defaults to
+ false.
+
@@ -256,7 +298,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.service5,
systemd.time7,