From 976904bf26957e75dbed467334592badf108beee Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 2 Oct 2023 17:09:29 +0100 Subject: [PATCH] bootctl: remove all our non-volatile variables on uninstall Grepping around showed a few extra entries that are not listed in the remove_loader_variables() function. Namely: - BootNext - OsIndications - LoaderConfigConsoleMode - LoaderEntryLastBooted Of which the latter two are systemd specific, even though they are undocumented. Ensure they're removed - follow-up commits will add documentation references. Signed-off-by: Emil Velikov --- src/boot/bootctl-install.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c index ca14564a8e..e6f66deeab 100644 --- a/src/boot/bootctl-install.c +++ b/src/boot/bootctl-install.c @@ -972,9 +972,11 @@ static int remove_loader_variables(void) { /* Remove all persistent loader variables we define */ FOREACH_STRING(var, + EFI_LOADER_VARIABLE(LoaderConfigConsoleMode), EFI_LOADER_VARIABLE(LoaderConfigTimeout), EFI_LOADER_VARIABLE(LoaderConfigTimeoutOneShot), EFI_LOADER_VARIABLE(LoaderEntryDefault), + EFI_LOADER_VARIABLE(LoaderEntryLastBooted), EFI_LOADER_VARIABLE(LoaderEntryOneShot), EFI_LOADER_VARIABLE(LoaderSystemToken)){ -- 2.25.1