curtin-dev team mailing list archive

[Ryan Harper <rharper@xxxxxxxxxxx>]

This looks good.  Can we get a comment in the commit message describing the failure?
In particular, I'm also looking to understand if this failure is reproducible in VMTest so we can add that scenario to VMTest in this commit as well.

Diff comments:

> diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
> index 3e6313f..9e045c8 100644
> --- a/curtin/commands/install_grub.py
> +++ b/curtin/commands/install_grub.py
> @@ -226,6 +226,12 @@ def find_efi_loader(target, bootid):
>      return None
>  
>  
> +def efi_loader_esp_path(loader):
> +    if loader.startswith('/boot/efi'):
> +        return loader[len('/boot/efi'):]

Since this is a fixed prefix, let's just use loader[9:]  # len('/boot/efi') == 9

> +    return loader
> +
> +
>  def get_efi_disk_part(devices):
>      for disk in devices:
>          (parent, partnum) = block.get_blockdev_for_partition(disk)


-- 
https://code.launchpad.net/~xnox/curtin/+git/curtin/+merge/396823
Your team curtin developers is requested to review the proposed merge of ~xnox/curtin:lp1906379-2 into curtin:master.