shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

Revert "core: don't load dropin data multiple times for the same unit (#5139)"

Browse Source 
This reverts commit 2d058a87ff.

When we add another name to a unit (by following an alias), we need to
reload all drop-ins. This is necessary to load any additional dropins
found in the dirs created from the alias name.

Fixes #6334.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-07-22 08:39:49 -04:00
parent 8ae12e733c
commit 9e4ea9cc34
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/unit.c
View File

@ -1098,7 +1098,6 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
/* Common implementation for multiple backends */
int unit_load_fragment_and_dropin(Unit *u) {
Unit *t;
int r;
assert(u);
@ -1111,18 +1110,15 @@ int unit_load_fragment_and_dropin(Unit *u) {
if (u->load_state == UNIT_STUB)
return -ENOENT;
/* If the unit is an alias and the final unit has already been
* loaded, there's no point in reloading the dropins one more time. */
t = unit_follow_merge(u);
if (t != u && t->load_state != UNIT_STUB)
return 0;
return unit_load_dropin(t);
/* Load drop-in directory data. If u is an alias, we might be reloading the
* target unit needlessly. But we cannot be sure which drops-ins have already
* been loaded and which not, at least without doing complicated book-keeping,
* so let's always reread all drop-ins. */
return unit_load_dropin(unit_follow_merge(u));
}
/* Common implementation for multiple backends */
int unit_load_fragment_and_dropin_optional(Unit *u) {
Unit *t;
int r;
assert(u);
@ -1138,13 +1134,8 @@ int unit_load_fragment_and_dropin_optional(Unit *u) {
if (u->load_state == UNIT_STUB)
u->load_state = UNIT_LOADED;
/* If the unit is an alias and the final unit has already been
* loaded, there's no point in reloading the dropins one more time. */
t = unit_follow_merge(u);
if (t != u && t->load_state != UNIT_STUB)
return 0;
return unit_load_dropin(t);
/* Load drop-in directory data */
return unit_load_dropin(unit_follow_merge(u));
}
int unit_add_default_target_dependency(Unit *u, Unit *target) {