clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 21:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared: install - report error if mask symlink can not be marked for removal

Browse Source 
(cherry picked from commit 56e73b34ce)
This commit is contained in:
Tom Gundersen
2015-01-15 22:01:36 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 48da391c5e
commit 9c521fc99e
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install.c
+5 -10
View File
@@ -662,7 +662,7 @@ int unit_file_unmask(
goto finish;
STRV_FOREACH(i, files) {
char *path;
_cleanup_free_ char *path = NULL;
if (!unit_name_is_valid(*i, TEMPLATE_VALID)) {
if (r == 0)
@@ -678,21 +678,16 @@ int unit_file_unmask(
q = null_or_empty_path(path);
if (q > 0) {
if (unlink(path) >= 0) {
mark_symlink_for_removal(&remove_symlinks_to, path);
if (unlink(path) < 0)
q = -errno;
else {
q = mark_symlink_for_removal(&remove_symlinks_to, path);
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
free(path);
continue;
}
q = -errno;
}
if (q != -ENOENT && r == 0)
r = q;
free(path);
}