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

install: make sure "systemctl disable foobar@.service" actually removes all instances

Browse Source
This commit is contained in:
Lennart Poettering
2014-06-17 02:43:43 +02:00
parent d54c499369
commit 559367add5
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install.c
+17 -7
View File
@@ -266,8 +266,22 @@ static int remove_marked_symlinks_fd(
if (unit_name_is_instance(de->d_name) &&
instance_whitelist &&
!strv_contains(instance_whitelist, de->d_name))
continue;
!strv_contains(instance_whitelist, de->d_name)) {
_cleanup_free_ char *w;
/* OK, the file is not listed directly
* in the whitelist, so let's check if
* the template of it might be
* listed. */
w = unit_name_template(de->d_name);
if (!w)
return -ENOMEM;
if (!strv_contains(instance_whitelist, w))
continue;
}
p = path_make_absolute(de->d_name, path);
if (!p)
@@ -290,18 +304,14 @@ static int remove_marked_symlinks_fd(
if (!found)
continue;
if (unlink(p) < 0 && errno != ENOENT) {
if (r == 0)
r = -errno;
continue;
}
rmdir_parents(p, config_path);
path_kill_slashes(p);
rmdir_parents(p, config_path);
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, p, NULL);
if (!set_get(remove_symlinks_to, p)) {