1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 16:21:26 +03:00

various: don't say that the timestamp 'changed' on initial load

I always found this a bit annoying.
With the patch:

$ SYSTEMD_LOG_LEVEL=debug build/udevadm test /sys/class/block/dm-1
...
Loaded timestamp for '/etc/systemd/network'.
Loaded timestamp for '/usr/lib/systemd/network'.
Parsed configuration file /usr/lib/systemd/network/99-default.link
Parsed configuration file /etc/systemd/network/10-eth0.link
Created link configuration context.
Loaded timestamp for '/etc/udev/rules.d'.
Loaded timestamp for '/usr/lib/udev/rules.d'.
...
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-06-01 17:40:51 +02:00
parent 0517ececff
commit 0d5a24beae

View File

@ -713,7 +713,7 @@ int find_executable_full(const char *name, bool use_path_envvar, char **ret_file
} }
bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) { bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) {
bool changed = false; bool changed = false, originally_unset;
const char* const* i; const char* const* i;
assert(timestamp); assert(timestamp);
@ -721,6 +721,8 @@ bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd
if (!paths) if (!paths)
return false; return false;
originally_unset = *timestamp == 0;
STRV_FOREACH(i, paths) { STRV_FOREACH(i, paths) {
struct stat stats; struct stat stats;
usec_t u; usec_t u;
@ -730,11 +732,11 @@ bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd
u = timespec_load(&stats.st_mtim); u = timespec_load(&stats.st_mtim);
/* first check */ /* check first */
if (*timestamp >= u) if (*timestamp >= u)
continue; continue;
log_debug("timestamp of '%s' changed", *i); log_debug(originally_unset ? "Loaded timestamp for '%s'." : "Timestamp of '%s' changed.", *i);
/* update timestamp */ /* update timestamp */
if (update) { if (update) {