From 0cb21d8c603f8d9412fff98508b198c276e03536 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 13 Oct 2018 15:12:16 +0200 Subject: [PATCH 1/2] core: add debug logging if we cant watch /etc/localtime itself --- src/core/manager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index af84a0a769f..f7bb066501a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -423,10 +423,14 @@ static int manager_setup_timezone_change(Manager *m) { r = sd_event_add_inotify(m->event, &new_event, "/etc/localtime", IN_ATTRIB|IN_MOVE_SELF|IN_CLOSE_WRITE|IN_DONT_FOLLOW, manager_dispatch_timezone_change, m); - if (r == -ENOENT) /* If the file doesn't exist yet, subscribe to /etc instead, and wait until it is created - * either by O_CREATE or by rename() */ + if (r == -ENOENT) { + /* If the file doesn't exist yet, subscribe to /etc instead, and wait until it is created either by + * O_CREATE or by rename() */ + + log_debug_errno(r, "/etc/localtime doesn't exist yet, watching /etc instead."); r = sd_event_add_inotify(m->event, &new_event, "/etc", IN_CREATE|IN_MOVED_TO|IN_ONLYDIR, manager_dispatch_timezone_change, m); + } if (r < 0) return log_error_errno(r, "Failed to create timezone change event source: %m"); From ea5c5f680dac5993a6dbce1d40278d4589e03497 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 13 Oct 2018 15:12:41 +0200 Subject: [PATCH 2/2] core: ensure it's not fatal if we cannot watch /etc/localtime See: #9602 --- src/core/manager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index f7bb066501a..06b75fa2496 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -839,9 +839,7 @@ int manager_new(UnitFileScope scope, ManagerTestRunFlags test_run_flags, Manager if (r < 0) return r; - r = manager_setup_timezone_change(m); - if (r < 0) - return r; + (void) manager_setup_timezone_change(m); r = manager_setup_sigchld_event_source(m); if (r < 0)