[Merge] ~juliank/grub/+git/ubuntu:resilient-boot into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Steve Langasek]

Diff comments:

> diff --git a/debian/templates.in b/debian/templates.in
> index 8fc05e5..b6fd580 100644
> --- a/debian/templates.in
> +++ b/debian/templates.in
> @@ -34,6 +34,60 @@ _Description: Update NVRAM variables to automatically boot into Debian?
>   if your NVRAM variables have been set up such that your system contacts a
>   PXE server on every boot, this would preserve that behavior.
>  
> +Template: grub2/efi_install_devices
> +Type: multiselect
> +Choices-C: ${RAW_CHOICES}
> +Choices: ${CHOICES}
> +_Description: GRUB EFI system partitions:

I still think it is better to use grub-efi/ for the template names, as this makes it clearer that these are specific to the grub-efi targets (which they are).  In the future we would also want the same behavior for grub-ieee1275.

Understood, re: templates not being straight find and replace.  I see now that the word "BIOS" appears in several templates, which is less than helpful for translation reuse.

> + The grub-efi package is being upgraded. This menu allows you to select which
> + EFI system partions you'd like grub-install to be automatically run for, if any.
> + .
> + Running grub-install automatically is recommended in most situations, to
> + prevent the installed GRUB core image from getting out of sync with GRUB
> + modules or grub.cfg.
> +
> +Template: grub2/efi_install_devices_disks_changed
> +Type: multiselect
> +Choices-C: ${RAW_CHOICES}
> +Choices: ${CHOICES}
> +_Description: GRUB install devices:
> + The GRUB boot loader was previously installed to a disk that is no longer
> + present, or whose unique identifier has changed for some reason. It is
> + important to make sure that the installed GRUB core image stays in sync
> + with GRUB modules and grub.cfg. Please check again to make sure that GRUB
> + is written to the appropriate boot devices.
> +
> +Template: grub2/efi_partition_description
> +Type: text
> +_Description: ${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}
> +
> +Template: grub2/efi_install_devices_failed
> +Type: boolean
> +Default: false
> +#flag:translate!:3
> +_Description: Writing GRUB to boot device failed - continue?
> + GRUB failed to install to the following devices:
> + .
> + ${FAILED_DEVICES}
> + .
> + Do you want to continue anyway? If you do, your computer may not start up
> + properly.
> +
> +Template: grub2/efi_install_devices_empty
> +Type: boolean
> +Default: false
> +_Description: Continue without installing GRUB?
> + You chose not to install GRUB to any devices. If you continue, the boot
> + loader may not be properly configured, and when this computer next starts
> + up it will use whatever was previously configured. If there is an
> + earlier version of GRUB 2 in the EFI system partition, it may be unable to load
> + modules or handle the current configuration file.
> + .
> + If you are already using a different boot loader and want to carry on
> + doing so, or if this is a special environment where you do not need a boot
> + loader, then you should continue anyway. Otherwise, you should install
> + GRUB somewhere.
> +
>  # still unused
>  Template: grub2/kfreebsd_cmdline
>  Type: string


-- 
https://code.launchpad.net/~juliank/grub/+git/ubuntu/+merge/381462
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu.