dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-10 17:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootctl: fix removing variables on uninstall

Browse Source 
remove_variables looks up the EFI boot entry by matching both the path
and the partition UUID and it wasn't actually removing any entries
because verb_remove was passing SD_ID128_NULL, so the lookup never
matched and Boot#### entries were left behind on uninstall.

Fixes 38433a6
This commit is contained in:
Clayton Craft
2026-04-29 19:33:58 -07:00
parent a52e0f87f5
commit a2ba538ead
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootctl/bootctl-install.c
View File

@@ -1859,7 +1859,6 @@ static int remove_loader_variables(void) {
}
int verb_remove(int argc, char *argv[], uintptr_t _data, void *userdata) {
sd_id128_t uuid = SD_ID128_NULL;
int r;
_cleanup_(install_context_done) InstallContext c = INSTALL_CONTEXT_NULL;
@@ -1927,7 +1926,7 @@ int verb_remove(int argc, char *argv[], uintptr_t _data, void *userdata) {
}
char *path = strjoina("/EFI/systemd/systemd-boot", get_efi_arch(), ".efi");
RET_GATHER(r, remove_variables(uuid, path, /* in_order= */ true));
RET_GATHER(r, remove_variables(c.esp_uuid, path, /* in_order= */ true));
return RET_GATHER(r, remove_loader_variables());
}