From 167da5251c81e7f05bcaaed76634ba53f010c86f Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Thu, 28 Mar 2024 17:22:08 +0000 Subject: vyos.system.grub: T3664: add chroot argument to the GRUB install function to faciliate running it outside of a VyOS installation (cherry picked from commit 90507681cfb39c5570f0afbf1542bd49feb5c0ab) --- python/vyos/system/grub.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'python/vyos') diff --git a/python/vyos/system/grub.py b/python/vyos/system/grub.py index 9e5305300..0d9c1340b 100644 --- a/python/vyos/system/grub.py +++ b/python/vyos/system/grub.py @@ -55,7 +55,7 @@ REGEX_KERNEL_CMDLINE: str = r'^BOOT_IMAGE=/(?Pboot|live)/((?P None: +def install(drive_path: str, boot_dir: str, efi_dir: str, id: str = 'VyOS', chroot : str = "") -> None: """Install GRUB for both BIOS and EFI modes (hybrid boot) Args: @@ -64,17 +64,22 @@ def install(drive_path: str, boot_dir: str, efi_dir: str, id: str = 'VyOS') -> N efi_dir (str): a path to '/boot/efi' directory """ + if chroot: + chroot_cmd = f"chroot {chroot}" + else: + chroot_cmd = "" + efi_installation_arch = "x86_64" if platform.machine() == "aarch64": efi_installation_arch = "arm64" elif platform.machine() == "x86_64": cmd( - f'grub-install --no-floppy --target=i386-pc \ + f'{chroot_cmd} grub-install --no-floppy --target=i386-pc \ --boot-directory={boot_dir} {drive_path} --force' ) cmd( - f'grub-install --no-floppy --recheck --target={efi_installation_arch}-efi \ + f'{chroot_cmd} grub-install --no-floppy --recheck --target={efi_installation_arch}-efi \ --force-extra-removable --boot-directory={boot_dir} \ --efi-directory={efi_dir} --bootloader-id="{id}" \ --no-uefi-secure-boot' @@ -457,3 +462,4 @@ def sort_inodes(dir_path: str) -> None: for item in temp_list_new: new_name = Path(f'{item.as_posix()[0:-4]}') item.rename(new_name) + -- cgit v1.2.3