From 9c999b53b9d93d7507f18d00810479ce98f44e87 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 25 Feb 2025 13:39:43 +0900 Subject: [PATCH] timesync: drop meaningless boolean flag The boolean flag is always true, as manager_save_time_and_rearm() is called unconditionally. Follow-up for 33e82f3ef33a2497f9838a5fbb924c7501d8dd9e. --- src/timesync/timesyncd-manager.c | 2 -- src/timesync/timesyncd-manager.h | 1 - src/timesync/timesyncd.c | 10 ++++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index f453c87864e..087fb7ab3b0 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1219,8 +1219,6 @@ static int manager_save_time_and_rearm(Manager *m, usec_t t) { if (r < 0) log_debug_errno(r, "Failed to update "TIMESYNCD_CLOCK_FILE", ignoring: %m"); - m->save_on_exit = true; - return manager_setup_save_time_event(m); } diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h index 68fc8f8853a..43dbef9417c 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/timesync/timesyncd-manager.h @@ -112,7 +112,6 @@ struct Manager { /* save time event */ sd_event_source *event_save_time; usec_t save_time_interval_usec; - bool save_on_exit; /* Used to coalesce bus PropertiesChanged events */ sd_event_source *deferred_ntp_server_event_source; diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index d002501d290..c9628169dca 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -221,12 +221,10 @@ static int run(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to run event loop: %m"); - /* if we got an authoritative time, store it in the file system */ - if (m->save_on_exit) { - r = touch(TIMESYNCD_CLOCK_FILE); - if (r < 0) - log_debug_errno(r, "Failed to touch "TIMESYNCD_CLOCK_FILE", ignoring: %m"); - } + /* Save the current time in the file system on exit. */ + r = touch(TIMESYNCD_CLOCK_FILE); + if (r < 0) + log_debug_errno(r, "Failed to touch "TIMESYNCD_CLOCK_FILE", ignoring: %m"); return 0; } -- 2.47.3