SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pid1: do not use mtime==0 as sign of masking (#4388)

Browse Source 
It is allowed for unit files to have an mtime==0, so instead of assuming that
any file that had mtime==0 was masked, use the load_state to filter masked
units.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1384150.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-10-17 07:15:03 +02:00
committed by Martin Pitt
parent a775369354
commit ba25d39e44
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/unit.c
+12 -8
View File
@@ -3053,7 +3053,7 @@ int unit_coldplug(Unit *u) {
return r;
}
static bool fragment_mtime_newer(const char *path, usec_t mtime) {
static bool fragment_mtime_newer(const char *path, usec_t mtime, bool path_masked) {
struct stat st;
if (!path)
@@ -3063,12 +3063,12 @@ static bool fragment_mtime_newer(const char *path, usec_t mtime) {
/* What, cannot access this anymore? */
return true;
if (mtime > 0)
if (path_masked)
/* For masked files check if they are still so */
return !null_or_empty(&st);
else
/* For non-empty files check the mtime */
return timespec_load(&st.st_mtim) > mtime;
else if (!null_or_empty(&st))
/* For masked files check if they are still so */
return true;
return false;
}
@@ -3079,18 +3079,22 @@ bool unit_need_daemon_reload(Unit *u) {
assert(u);
if (fragment_mtime_newer(u->fragment_path, u->fragment_mtime))
/* For unit files, we allow masking… */
if (fragment_mtime_newer(u->fragment_path, u->fragment_mtime,
u->load_state == UNIT_MASKED))
return true;
if (fragment_mtime_newer(u->source_path, u->source_mtime))
/* Source paths should not be masked… */
if (fragment_mtime_newer(u->source_path, u->source_mtime, false))
return true;
(void) unit_find_dropin_paths(u, &t);
if (!strv_equal(u->dropin_paths, t))
return true;
/* … any drop-ins that are masked are simply omitted from the list. */
STRV_FOREACH(path, u->dropin_paths)
if (fragment_mtime_newer(*path, u->dropin_mtime))
if (fragment_mtime_newer(*path, u->dropin_mtime, false))
return true;
return false;