shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

timesync: move stamp file to /var/lib/systemd/timesync/clock

Browse Source
This commit is contained in:
Yu Watanabe 2017-08-30 15:59:57 +09:00
parent 87a85e25a2
commit 53d133ea1b
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd-timesyncd.service.xml
View File

@ -88,7 +88,7 @@
<variablelist>
<varlistentry>
<term><filename>/var/lib/systemd/clock</filename></term>
<term><filename>/var/lib/systemd/timesync/clock</filename></term>
<listitem>
<para>This file contains the timestamp of the last successful

2
src/timesync/timesyncd-manager.c
View File

@ -373,7 +373,7 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
return -errno;
/* If touch fails, there isn't much we can do. Maybe it'll work next time. */
(void) touch("/var/lib/systemd/clock");
(void) touch("/var/lib/systemd/timesync/clock");
m->drift_ppm = tmx.freq / 65536;

27
src/timesync/timesyncd.c
View File

@ -24,6 +24,7 @@
#include "clock-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "mkdir.h"
#include "network-util.h"
#include "process-util.h"
#include "signal-util.h"
@ -44,7 +45,7 @@ static int load_clock_timestamp(uid_t uid, gid_t gid) {
* systems lacking a battery backed RTC. We also will adjust
* the time to at least the build time of systemd. */
fd = open("/var/lib/systemd/clock", O_RDWR|O_CLOEXEC, 0644);
fd = open("/var/lib/systemd/timesync/clock", O_RDWR|O_CLOEXEC, 0644);
if (fd >= 0) {
struct stat st;
usec_t stamp;
@ -57,14 +58,24 @@ static int load_clock_timestamp(uid_t uid, gid_t gid) {
min = stamp;
}
/* Try to fix the access mode, so that we can still
touch the file after dropping priviliges */
(void) fchmod(fd, 0644);
(void) fchown(fd, uid, gid);
if (geteuid() == 0) {
/* Try to fix the access mode, so that we can still
touch the file after dropping priviliges */
r = fchmod(fd, 0644);
if (r < 0)
return log_error_errno(errno, "Failed to change file access mode: %m");
r = fchown(fd, uid, gid);
return log_error_errno(errno, "Failed to change file owner: %m");
}
} else {
r = mkdir_safe_label("/var/lib/systemd/timesync", 0755, uid, gid);
if (r < 0)
return log_error_errno(r, "Failed to create state directory: %m");
} else
/* create stamp file with the compiled-in date */
(void) touch_file("/var/lib/systemd/clock", true, min, uid, gid, 0644);
(void) touch_file("/var/lib/systemd/timesync/clock", false, min, uid, gid, 0644);
}
ct = now(CLOCK_REALTIME);
if (ct < min) {
@ -162,7 +173,7 @@ int main(int argc, char *argv[]) {
/* if we got an authoritative time, store it in the file system */
if (m->sync)
(void) touch("/var/lib/systemd/clock");
(void) touch("/var/lib/systemd/timesync/clock");
sd_event_get_exit_code(m->event, &r);

4
units/systemd-timesyncd.service.in
View File

@ -11,7 +11,7 @@ Documentation=man:systemd-timesyncd.service(8)
ConditionCapability=CAP_SYS_TIME
ConditionVirtualization=!container
DefaultDependencies=no
RequiresMountsFor=/var/lib/systemd/clock
RequiresMountsFor=/var/lib/systemd/timesync/clock
After=systemd-remount-fs.service systemd-sysusers.service
Before=time-sync.target sysinit.target shutdown.target
Conflicts=shutdown.target
@ -39,7 +39,7 @@ RestrictNamespaces=yes
RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
SystemCallFilter=~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @swap
SystemCallArchitectures=native
ReadWritePaths=/var/lib/systemd
StateDirectory=systemd/timesync
[Install]
WantedBy=sysinit.target