mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

install: allow removing symlinks even for units that are gone

Browse Source 
If a symlink is leftover, still allow cleaning it up via 'disable'. This
happens when a unit is stopped and removed, but not disabled, and a reload
has already happened. At that point, cleaning up the old symlinks becomes
impossible through the APIs, and needs to be done manually. Always allow
cleaning up symlinks, if they exist, by only erroring out if there is an
OOM.

Follow-up for f31f10a620

(cherry picked from commit 5163c9b1e5)
This commit is contained in:
Luca Boccassi 2024-06-07 21:39:45 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent a776dcf7af
commit c26e56d08f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/install.c
View File

@ -2282,7 +2282,9 @@ static int install_context_mark_for_removal(
else {
log_debug_errno(r, "Unit %s not found, removing name.", i->name);
r = install_changes_add(changes, n_changes, r, i->path ?: i->name, NULL);
if (r < 0)
/* In case there's no unit, we still want to remove any leftover symlink, even if
* the unit might have been removed already, hence treating ENOENT as non-fatal. */
if (r != -ENOENT)
return r;
}
} else if (r < 0) {
@ -2874,9 +2876,13 @@ static int do_unit_file_disable(
r = install_info_add(&ctx, *name, NULL, lp->root_dir, /* auxiliary= */ false, &info);
if (r >= 0)
r = install_info_traverse(&ctx, lp, info, SEARCH_LOAD|SEARCH_FOLLOW_CONFIG_SYMLINKS, NULL);
if (r < 0)
return install_changes_add(changes, n_changes, r, *name, NULL);
if (r < 0) {
r = install_changes_add(changes, n_changes, r, *name, NULL);
/* In case there's no unit, we still want to remove any leftover symlink, even if
* the unit might have been removed already, hence treating ENOENT as non-fatal. */
if (r != -ENOENT)
return r;
}
/* If we enable multiple units, some with install info and others without,
* the "empty [Install] section" warning is not shown. Let's make the behavior

6
test/units/TEST-26-SYSTEMCTL.sh
View File

@ -343,6 +343,12 @@ systemctl cat "$UNIT_NAME"
systemctl help "$UNIT_NAME"
systemctl service-watchdogs
systemctl service-watchdogs "$(systemctl service-watchdogs)"
# Ensure that the enablement symlinks can still be removed after the user is gone, to avoid having leftovers
systemctl enable "$UNIT_NAME"
systemctl stop "$UNIT_NAME"
rm -f "/usr/lib/systemd/system/$UNIT_NAME"
systemctl daemon-reload
systemctl disable "$UNIT_NAME"
# show/set-environment
# Make sure PATH is set