[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     624f99730fbaf744b60fc20d097509d5ae64d13d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 14:54:27 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 14:54:27 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=624f9973

Add EFI grub installation

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/diskimage-stage2/controller.sh | 5 ++++-
 targets/support/qcow2-install-grub.sh  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh
index 2c70642c..b676023d 100755
--- a/targets/diskimage-stage2/controller.sh
+++ b/targets/diskimage-stage2/controller.sh
@@ -24,7 +24,10 @@ case $1 in
 		# Install dracut
 		exec_in_chroot ${clst_shdir}/support/pre-distkmerge.sh
 		;;
-
+        run)
+		# We need to install grub's EFI files
+		exec_in_chroot "${clst_shdir}/support/qcow2-install-grub.sh"
+		;;
 	preclean)
 		;;
 

diff --git a/targets/support/qcow2-install-grub.sh b/targets/support/qcow2-install-grub.sh
new file mode 100755
index 00000000..75d98768
--- /dev/null
+++ b/targets/support/qcow2-install-grub.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+grub-install --verbose --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=x86_64-efi || die "grub-install failed"