diff options
| author | Mathew McBride <matt@traverse.com.au> | 2023-12-11 16:15:34 +1100 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-02-09 07:27:07 +0000 |
| commit | 5aa56c5cc4524f7cd57f1979726b82e6537090f6 (patch) | |
| tree | 375b8e12b4ec9ee68699106d42c5fd797c4a764b /python/vyos/system | |
| parent | 267579006a98fbdc5802b428d24a917421a56cb2 (diff) | |
| download | vyos-1x-5aa56c5cc4524f7cd57f1979726b82e6537090f6.tar.gz vyos-1x-5aa56c5cc4524f7cd57f1979726b82e6537090f6.zip | |
T5828: fix grub installation on arm64-efi machines
Since the migration of GRUB handling to vyos-1x, the grub install
sequence has hardcoded references to x86.
Change the GRUB sequence so it can work on arm64 as well.
(cherry picked from commit 37bd574c4e1f49b03f985c4293513ff7107ae82f)
Diffstat (limited to 'python/vyos/system')
| -rw-r--r-- | python/vyos/system/grub.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/python/vyos/system/grub.py b/python/vyos/system/grub.py index 4e133c5fc..2e8b20972 100644 --- a/python/vyos/system/grub.py +++ b/python/vyos/system/grub.py @@ -13,6 +13,8 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library. If not, see <http://www.gnu.org/licenses/>. +import platform + from pathlib import Path from re import MULTILINE, compile as re_compile from typing import Union @@ -61,16 +63,22 @@ def install(drive_path: str, boot_dir: str, efi_dir: str, id: str = 'VyOS') -> N boot_dir (str): a path to '/boot' directory efi_dir (str): a path to '/boot/efi' directory """ - commands: list[str] = [ - f'grub-install --no-floppy --target=i386-pc --boot-directory={boot_dir} \ - {drive_path} --force', - f'grub-install --no-floppy --recheck --target=x86_64-efi \ + + 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 \ + --boot-directory={boot_dir} {drive_path} --force' + ) + + cmd( + f'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' - ] - for command in commands: - cmd(command) + ) def gen_version_uuid(version_name: str) -> str: |