From ff7a3522dfda635e3326ee2f3f8abcd48c2456e9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Oct 2025 04:26:19 +0900 Subject: [PATCH 1/3] sd-bus: silence spurious debugging log message --- src/libsystemd/sd-bus/bus-socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index a8d47d8428..cdda006306 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -886,16 +886,16 @@ static int bus_socket_inotify_setup(sd_bus *b) { } wd = inotify_add_watch(b->inotify_fd, prefix, IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CREATE|IN_MOVED_TO|IN_DONT_FOLLOW); - log_debug("Added inotify watch for %s on bus %s: %i", prefix, strna(b->description), wd); - if (wd < 0) { if (IN_SET(errno, ENOENT, ELOOP)) break; /* This component doesn't exist yet, or the path contains a cyclic symlink right now */ r = log_debug_errno(errno, "Failed to add inotify watch on %s: %m", empty_to_root(prefix)); goto fail; - } else + } else { + log_debug("Added inotify watch %i for %s on bus %s.", wd, prefix, strna(b->description)); new_watches[n++] = wd; + } /* Check if this is possibly a symlink. If so, let's follow it and watch it too. */ r = readlink_malloc(prefix, &destination); From a6b5e247460de7a6efe57aa9e6dfbf62962a3ef4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Oct 2025 04:21:32 +0900 Subject: [PATCH 2/3] timesync: drop redundant space --- src/timesync/timesyncd-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 6351179a62..004adf0b4f 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -911,7 +911,7 @@ void manager_disconnect(Manager *m) { (void) sd_notify(false, "STATUS=Idle."); } -void manager_flush_server_names(Manager *m, ServerType t) { +void manager_flush_server_names(Manager *m, ServerType t) { assert(m); if (t == SERVER_SYSTEM) From 3cc725ca6b27fc4acff68b2f3a024c02c59f3f60 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Oct 2025 04:03:39 +0900 Subject: [PATCH 3/3] timesync: assume link NTP servers are unchanged on error and no servers registered yet This also silences annoying debug message when networkd is not running, in which case sd_network_get_ntp() returns -ENOENT. --- src/timesync/timesyncd-manager.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 004adf0b4f..6bfe4e075f 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -966,19 +966,19 @@ Manager* manager_free(Manager *m) { return mfree(m); } -static int manager_network_read_link_servers(Manager *m) { +static bool manager_network_read_link_servers(Manager *m) { _cleanup_strv_free_ char **ntp = NULL; bool changed = false; int r; assert(m); + bool existing = m->link_servers; + r = sd_network_get_ntp(&ntp); - if (r < 0 && r != -ENODATA) { - if (r == -ENOMEM) - log_oom(); - else - log_debug_errno(r, "Failed to get link NTP servers: %m"); + if (r < 0) { + if (!IN_SET(r, -ENOENT, -ENODATA)) + log_error_errno(r, "Failed to get link NTP servers: %m"); goto clear; } @@ -1025,7 +1025,7 @@ static int manager_network_read_link_servers(Manager *m) { clear: manager_flush_server_names(m, SERVER_LINK); - return r; + return existing; /* return true if there were existing servers. */ } static bool manager_is_connected(Manager *m) { @@ -1043,7 +1043,6 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re sd_network_monitor_flush(m->network_monitor); - /* When manager_network_read_link_servers() failed, we assume that the servers are changed. */ changed = manager_network_read_link_servers(m); /* check if the machine is online */