shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-27 14:03:43 +03:00
Code

Merge pull request #14156 from fbuihuu/deal-with-aliases-when-disabling

Browse Source 
Consider aliases in /usr when disabling units
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-02-06 10:46:21 +01:00 committed by GitHub
commit 5650ec7a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/unit.c
View File

@ -5388,7 +5388,7 @@ static void unit_update_dependency_mask(Unit *u, UnitDependency d, Unit *other,
if (di.origin_mask == 0 && di.destination_mask == 0) {
/* No bit set anymore, let's drop the whole entry */
assert_se(hashmap_remove(u->dependencies[d], other));
log_unit_debug(u, "%s lost dependency %s=%s", u->id, unit_dependency_to_string(d), other->id);
log_unit_debug(u, "lost dependency %s=%s", unit_dependency_to_string(d), other->id);
} else
/* Mask was reduced, let's update the entry */
assert_se(hashmap_update(u->dependencies[d], other, di.data) == 0);

6
src/shared/install.c
View File

@ -580,7 +580,7 @@ static int remove_marked_symlinks_fd(
return -ENOMEM;
path_simplify(p, false);
q = readlink_malloc(p, &dest);
q = chase_symlinks(p, NULL, CHASE_NONEXISTENT, &dest, NULL);
if (q == -ENOENT)
continue;
if (q < 0) {
@ -1117,7 +1117,7 @@ static int config_parse_also(
void *data,
void *userdata) {
UnitFileInstallInfo *info = userdata, *alsoinfo = NULL;
UnitFileInstallInfo *info = userdata;
InstallContext *c = data;
int r;
@ -1139,7 +1139,7 @@ static int config_parse_also(
if (r < 0)
return r;
r = install_info_add(c, printed, NULL, true, &alsoinfo);
r = install_info_add(c, printed, NULL, true, NULL);
if (r < 0)
return r;