[PATCH] Always run efibootmgr from ROOT_PATH

Vratislav Podzimek vpodzime at redhat.com
Fri Jan 17 13:10:06 UTC 2014


On Thu, 2014-01-16 at 17:00 -0800, Brian C. Lane wrote:
> ---
>  pyanaconda/bootloader.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 2d09bd3..251275b 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1635,6 +1635,8 @@ class EFIGRUB(GRUB2):
>              exec_func = iutil.execWithCapture
>          else:
>              exec_func = iutil.execWithRedirect
> +        if "root" not in kwargs:
> +            kwargs["root"] = ROOT_PATH
>  
>          return exec_func("efibootmgr", list(args), **kwargs)
>  
> @@ -1657,8 +1659,7 @@ class EFIGRUB(GRUB2):
>                      log.warning("failed to parse efi boot slot (%s)", slot)
>                      continue
>  
> -                rc = self.efibootmgr("-b", slot_id, "-B",
> -                                     root=ROOT_PATH)
> +                rc = self.efibootmgr("-b", slot_id, "-B")
>                  if rc:
>                      raise BootLoaderError("failed to remove old efi boot entry")
>  
> @@ -1681,8 +1682,7 @@ class EFIGRUB(GRUB2):
>          rc = self.efibootmgr("-c", "-w", "-L", productName,
>                               "-d", boot_disk.path, "-p", boot_part_num,
>                               "-l",
> -                             self.efi_dir_as_efifs_dir + "\\shim.efi",
> -                             root=ROOT_PATH)
> +                             self.efi_dir_as_efifs_dir + "\\shim.efi")
>          if rc:
>              raise BootLoaderError("failed to set new efi boot target")
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list