diff options
| -rw-r--r-- | man/systemd.special.xml | 13 | ||||
| -rw-r--r-- | units/meson.build | 1 | ||||
| -rw-r--r-- | units/systemd-timesyncd.service.in | 4 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-clean.service.in | 2 | ||||
| -rw-r--r-- | units/time-set.target | 13 | ||||
| -rw-r--r-- | units/time-sync.target | 2 |
6 files changed, 32 insertions, 3 deletions
diff --git a/man/systemd.special.xml b/man/systemd.special.xml index b7df5016ce..248fb924db 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -77,6 +77,7 @@ <filename>sysinit.target</filename>, <filename>system-update.target</filename>, <filename>system-update-pre.target</filename>, + <filename>time-set.target</filename>, <filename>time-sync.target</filename>, <filename>timers.target</filename>, <filename>umount.target</filename>, @@ -951,6 +952,18 @@ </listitem> </varlistentry> <varlistentry> + <term><filename>time-set.target</filename></term> + <listitem> + <para>Services responsible for setting the system clock from + a local source (such as a maintained timestamp file or + imprecise real-time clock) should pull in this target and + order themselves before it. Services where approximate time + is desired should be ordered after this unit, but not pull + it in. This target does not provide the accuracy guarantees + of <filename>time-sync.target</filename>.</para> + </listitem> + </varlistentry> + <varlistentry> <term><filename>time-sync.target</filename></term> <listitem> <para>Services responsible for synchronizing the system diff --git a/units/meson.build b/units/meson.build index a53632cd9d..a5610506d5 100644 --- a/units/meson.build +++ b/units/meson.build @@ -104,6 +104,7 @@ units = [ 'sockets.target.wants/'], ['systemd-udevd-kernel.socket', '', 'sockets.target.wants/'], + ['time-set.target', ''], ['time-sync.target', ''], ['timers.target', ''], ['tmp.mount', '', diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in index 6512531e1c..2d8d14f6de 100644 --- a/units/systemd-timesyncd.service.in +++ b/units/systemd-timesyncd.service.in @@ -14,9 +14,9 @@ ConditionCapability=CAP_SYS_TIME ConditionVirtualization=!container DefaultDependencies=no After=systemd-remount-fs.service systemd-sysusers.service -Before=time-sync.target sysinit.target shutdown.target +Before=time-set.target sysinit.target shutdown.target Conflicts=shutdown.target -Wants=time-sync.target +Wants=time-set.target time-sync.target [Service] AmbientCapabilities=CAP_SYS_TIME diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index d1025afadb..9e2f04bfef 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -12,7 +12,7 @@ Description=Cleanup of Temporary Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target -After=local-fs.target time-sync.target +After=local-fs.target time-set.target Before=shutdown.target [Service] diff --git a/units/time-set.target b/units/time-set.target new file mode 100644 index 0000000000..6b40033529 --- /dev/null +++ b/units/time-set.target @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# 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. + +[Unit] +Description=System Time Set +Documentation=man:systemd.special(7) +RefuseManualStart=yes diff --git a/units/time-sync.target b/units/time-sync.target index 1533c7c33c..9106502e8b 100644 --- a/units/time-sync.target +++ b/units/time-sync.target @@ -11,3 +11,5 @@ Description=System Time Synchronized Documentation=man:systemd.special(7) RefuseManualStart=yes +After=time-set.target +Wants=time-set.target |