diff options
| author | Mathew McBride <matt@traverse.com.au> | 2022-11-08 00:35:46 +0000 |
|---|---|---|
| committer | Mathew McBride <matt@traverse.com.au> | 2022-11-15 23:27:01 +0000 |
| commit | 10f1833c39c0f4f2a682c8a9b5fc84d831887521 (patch) | |
| tree | 7ff98e28f4332babe150499cd640d8e3416fdda3 | |
| parent | c4b740ba50b8a1f810c360061d199a7928fd3c4d (diff) | |
| download | vyatta-cfg-system-10f1833c39c0f4f2a682c8a9b5fc84d831887521.tar.gz vyatta-cfg-system-10f1833c39c0f4f2a682c8a9b5fc84d831887521.zip | |
T4822: install the correct version of GRUB for architecture (arm64)
Fix a hardcoded x86_64-efi reference, and ensure the correct GRUB binary package is installed
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | scripts/install/install-postinst-new | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 6c2f78d3..e94e4084 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Depends: adduser, efibootmgr, libefivar0 | libefivar1, grub-efi-amd64-bin [amd64], + grub-efi-arm64-bin [arm64], dosfstools, gdisk, vyatta-biosdevname diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index 19257398..8bb7c8bd 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -24,6 +24,11 @@ INSTALL_TYPE=$3 # Default user DEFAULT_USER=vyos +GRUB_ARCH=x86_64-efi +if [ $(uname -m) = "aarch64" ]; then + GRUB_ARCH=arm64-efi +fi + # copy configuration to the config directory copy_config () { local cfg_dir=${INST_ROOT}${VYATTA_CFG_DIR} @@ -138,7 +143,7 @@ install_grub () { fi mkdosfs -F 32 -s 1 -n EFI /dev/$part >&/dev/null mount /dev/$part $grub_root/boot/efi - output=$(grub-install --no-floppy --recheck --target=x86_64-efi --force-extra-removable --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" --no-uefi-secure-boot 2>&1) + output=$(grub-install --no-floppy --recheck --target="${GRUB_ARCH}" --force-extra-removable --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" --no-uefi-secure-boot 2>&1) umount $grub_root/boot/efi ##TODO DO we need these to be in fstab?? # |