curtin-dev team mailing list archive

[Malo Paletou <mp+454385@xxxxxxxxxxxxxxxxxx>]

Malo Paletou has proposed merging ~mpaletou/curtin:fix-debian-multi-install-grub-options into curtin:master.

Commit message:
fix: do not ignore update_nvram arg with grub multi

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mpaletou/curtin/+git/curtin/+merge/454385

When installing Debian based systems in UEFI boot, --update-nvram option was ignored as it performs multi-install and that not arguments are given to this command.

This fix just take update_nvram parameter in account if the user defines it
-- 
Your team curtin developers is requested to review the proposed merge of ~mpaletou/curtin:fix-debian-multi-install-grub-options into curtin:master.

diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
index 285e6a5..da694bf 100644
--- a/curtin/commands/install_grub.py
+++ b/curtin/commands/install_grub.py
@@ -335,7 +335,7 @@ def gen_uefi_install_commands(grub_name, grub_target, grub_cmd, update_nvram,
 
     if grub_cmd == GRUB_MULTI_INSTALL:
         # grub-multi-install is called with no arguments
-        install_cmds.append([grub_cmd])
+        install_cmds.append([grub_cmd] + ([] if update_nvram else ['--no-nvram']))
     elif grub_cmd:
         install_cmds.append(
             [grub_cmd, '--target=%s' % grub_target,