tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/grub-editenv: Wire unset_variables() to optional fs_envblk

Browse Source 
This patch updates unset_variables() so that removals are also applied
to the external environment block when it is present. The code opens the
external block, deletes the same named keys there, and then writes the
external block back using fs_envblk_write(). The file based envblk is
still updated and written as before.

Signed-off-by: Michael Chang <mchang@suse.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Avnish Chouhan <avnish@linux.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Michael Chang 2025-10-17 17:01:37 +08:00 committed by Daniel Kiper
parent c7c9019165
commit 84e2bc2f1e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/grub-editenv.c
View File

@ -499,18 +499,32 @@ static void
unset_variables (const char *name, int argc, char *argv[])
{
grub_envblk_t envblk;
grub_envblk_t envblk_on_block = NULL;
envblk = open_envblk_file (name);
if (fs_envblk != NULL)
envblk_on_block = fs_envblk->ops->open (envblk);
while (argc)
{
grub_envblk_delete (envblk, argv[0]);
if (envblk_on_block != NULL)
grub_envblk_delete (envblk_on_block, argv[0]);
argc--;
argv++;
}
write_envblk (name, envblk);
grub_envblk_close (envblk);
if (envblk_on_block != NULL)
{
fs_envblk->ops->write (envblk_on_block);
grub_envblk_close (envblk_on_block);
}
}
int