From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A349E158046 for ; Sat, 12 Oct 2024 14:54:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEB8FE2A4E; Sat, 12 Oct 2024 14:54:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEC99E2A4E for ; Sat, 12 Oct 2024 14:54:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED42134317D for ; Sat, 12 Oct 2024 14:54:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89E481671 for ; Sat, 12 Oct 2024 14:54:44 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1728744867.624f99730fbaf744b60fc20d097509d5ae64d13d.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/diskimage-stage2/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/diskimage-stage2/controller.sh targets/support/qcow2-install-grub.sh X-VCS-Directories: targets/diskimage-stage2/ targets/support/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 624f99730fbaf744b60fc20d097509d5ae64d13d X-VCS-Branch: dilfridge/qcow2 Date: Sat, 12 Oct 2024 14:54:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c38a804-8638-4526-8aa9-b65174881fd6 X-Archives-Hash: f64db587a149ed3be072ae6a5946b653 commit: 624f99730fbaf744b60fc20d097509d5ae64d13d Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 12 14:54:27 2024 +0000 Commit: Andreas K. Hüttel gentoo 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 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"