Merge ~sil2100/curtin:auto-nvram into curtin:master

[Łukasz Zemczak]

Support --auto-nvram in curtin when running grub-install.

This still needs checking if actually --auto-nvram won't make the whole
grub_install update-nvram experience better.

Support --auto-nvram in curtin when running grub-install.

This still needs checking if actually --auto-nvram won't make the whole grub_install update-nvram experience better.

[Steve Langasek (vorlon)]

It only makes sense to use --auto-nvram when we can be confident that the system will be bootable afterwards - either via the MBR, or via shim fallback + BOOTX64.CSV, or both. Are we confident that this is the case here? Should we be landing more extensive changes to ensure installation of grub-pc + shim-signed at the same time?

[Scott Moser (smoser)]

review: Needs Information

Unmerged commits

b897cc8... by Łukasz Zemczak on 2018-05-30

First try on getting --auto-nvram supported for the grub-install calls.

diff --git a/helpers/common b/helpers/common
index ac2d0f3..cccc25a 100644
--- a/helpers/common
+++ b/helpers/common
@@ -703,13 +703,15 @@ install_grub() {
             # or --efi-directory
             target="--target=$2"
             no_nvram="$3"
+            auto_nvram="--auto-nvram"
             efi_dir="--efi-directory=/boot/efi"
             gi_out=$(grub-install --help 2>&1)
             echo "$gi_out" | grep -q -- "$no_nvram" || no_nvram=""
             echo "$gi_out" | grep -q -- "--target" || target=""
             echo "$gi_out" | grep -q -- "--efi-directory" || efi_dir=""
+            echo "$gi_out" | grep -q -- "$auto_nvram" || auto_nvram=""
             grub-install $target $efi_dir \
-                --bootloader-id=ubuntu --recheck $no_nvram' -- \
+                --bootloader-id=ubuntu --recheck $no_nvram $auto_nvram' -- \
             "${grub_name}" "${grub_target}" "$nvram" </dev/null ||
             { error "failed to install grub!"; return 1; }
 
@@ -730,7 +732,10 @@ install_grub() {
             pkg=$1; shift;
             dpkg-reconfigure "$pkg"
             update-grub
-            for d in "$@"; do grub-install "$d" || exit; done' \
+            auto_nvram="--auto-nvram"
+            gi_out=$(grub-install --help 2>&1)
+            echo "$gi_out" | grep -q -- "$auto_nvram" || auto_nvram=""
+            for d in "$@"; do grub-install "$d" $auto_nvram || exit; done' \
             -- "${grub_name}" "${grubdevs[@]}" </dev/null ||
             { error "failed to install grub!"; return 1; }
     fi