Merge lp:~blake-rouse/curtin/curtin-no-nvram into lp:~curtin-dev/curtin/trunk

[Blake Rouse]

Add --no-nvram to the grub-install command for UEFI.

This stops grub from changing the EFI boot options, keeping machines booting from network instead of the newly installed system.

=== modified file 'helpers/common'
--- helpers/common	2015-05-15 16:44:54 +0000
+++ helpers/common	2015-05-22 15:10:26 +0000
@@ -312,7 +312,7 @@
         wipe_partitions "$target" 1 ||
             { error "failed to wipe partition 1 on $target"; return 1; }
     fi
-    
+
 }
 
 pt_prep() {
@@ -608,7 +608,7 @@
             dpkg-reconfigure "$1"
             update-grub
             grub-install --target=$2 --efi-directory=/boot/efi \
-                --bootloader-id=ubuntu --recheck' -- \
+                --bootloader-id=ubuntu --recheck --no-nvram' -- \
             "${grub_name}" "${grub_target}" </dev/null ||
             { error "failed to install grub!"; return 1; }
     else