aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2023-04-21 21:16:16 +0000
committerPascal Terjan <pterjan@gmail.com>2023-04-21 21:16:16 +0000
commit48cc20fa0f1ca83f26577df702ed64beeb1d3b32 (patch)
tree9db1d355082c2fe438cb490a6bbf5eff55f48092
parent166ecfd9e4aac73372ead7529d04a29888b69896 (diff)
downloadmageia4arm-48cc20fa0f1ca83f26577df702ed64beeb1d3b32.tar
mageia4arm-48cc20fa0f1ca83f26577df702ed64beeb1d3b32.tar.gz
mageia4arm-48cc20fa0f1ca83f26577df702ed64beeb1d3b32.tar.bz2
mageia4arm-48cc20fa0f1ca83f26577df702ed64beeb1d3b32.tar.xz
mageia4arm-48cc20fa0f1ca83f26577df702ed64beeb1d3b32.zip
Improve GRUB fix by using --removable
-rw-r--r--platforms/rpi-aarch64/second_stage_install.sh2
-rwxr-xr-xplatforms/rpi-aarch64/specialFunctions.sh3
2 files changed, 1 insertions, 4 deletions
diff --git a/platforms/rpi-aarch64/second_stage_install.sh b/platforms/rpi-aarch64/second_stage_install.sh
index 2e48e10..88125ae 100644
--- a/platforms/rpi-aarch64/second_stage_install.sh
+++ b/platforms/rpi-aarch64/second_stage_install.sh
@@ -36,7 +36,7 @@ export ARCH=arm64
mv /etc/grub.d/30_os-prober /tmp
/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
-/usr/sbin/grub2-install --skip-fs-probe --target=arm64-efi --efi-directory=/boot/EFI --force --force-file-id --bootloader-id=BOOT
+/usr/sbin/grub2-install --skip-fs-probe --target=arm64-efi --efi-directory=/boot/EFI --removable --no-nvram --force-file-id
mv /tmp/30_os-prober /etc/grub.d/
/usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony
diff --git a/platforms/rpi-aarch64/specialFunctions.sh b/platforms/rpi-aarch64/specialFunctions.sh
index 5d28b05..8209db3 100755
--- a/platforms/rpi-aarch64/specialFunctions.sh
+++ b/platforms/rpi-aarch64/specialFunctions.sh
@@ -67,8 +67,5 @@ function copyingCustomSystem()
# cp --preserve=mode ${BUILD_PATH}/usr/lib64/linux-*/${f} "${BOOT}/"
# done
- print_info "renaming GRUB EFI executable"
- # u-boot only supports booting from /EFI/BOOT/bootaa64.efi
- mv -v "${BOOT}/EFI/BOOT/grubaa64.efi" "${BOOT}/EFI/BOOT/bootaa64.efi"
return 0
}