diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-31 00:22:33 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-31 00:38:50 -0400 |
commit | 3a8db9fe81b3f7faae7f09c4ac7d2c863bf0177d (patch) | |
tree | a15ff7b336472ea59899e00c08e3bb01a04b2efa /src/core/unit.c | |
parent | 21b95806b88bd645a7ded8274240f37fb65ea150 (diff) |
core: treat masked files as "unchanged"
systemctl prints the "unit file changed on disk" warning
for a masked unit. I think it's better to print nothing in that
case.
When a masked unit is loaded, set mtime as 0. When checking
if a unit with mtime of 0 needs reload, check that the mask
is still in place.
Diffstat (limited to 'src/core/unit.c')
-rw-r--r-- | src/core/unit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 64d5ed04c9..70175557f7 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2934,7 +2934,11 @@ static bool fragment_mtime_changed(const char *path, usec_t mtime) { /* What, cannot access this anymore? */ return true; - if (mtime > 0 && timespec_load(&st.st_mtim) != mtime) + if (mtime > 0) + /* 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; |