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 <[email protected]> Reviewed-by: Neal Gompa <[email protected]> Reviewed-by: Avnish Chouhan <[email protected]> --- util/grub-editenv.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/util/grub-editenv.c b/util/grub-editenv.c index beb2dd4fc..455bb2757 100644 --- a/util/grub-editenv.c +++ b/util/grub-editenv.c @@ -487,18 +487,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); + } } static bool -- 2.51.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
