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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 667A2138334 for ; Fri, 13 Jul 2018 20:00:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72351E0817; Fri, 13 Jul 2018 20:00:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43452E0817 for ; Fri, 13 Jul 2018 20:00:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFEE4335C32 for ; Fri, 13 Jul 2018 20:00:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 116BB2E5 for ; Fri, 13 Jul 2018 20:00:34 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1531512025.198f3cda78d42dd5864c3819d21c920fa9cd6383.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 198f3cda78d42dd5864c3819d21c920fa9cd6383 X-VCS-Branch: master Date: Fri, 13 Jul 2018 20:00:34 +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-Archives-Salt: 022ac8e8-f106-4a5f-9883-4efef496c517 X-Archives-Hash: 8d5fa878f16032f4cd917f0316e499ef commit: 198f3cda78d42dd5864c3819d21c920fa9cd6383 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Fri Jul 13 20:00:25 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Fri Jul 13 20:00:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=198f3cda thanks to iamben for teaching me how this works, and my own testing, this file is also included in the standalone grub image and not needed targets/support/functions.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 9a7441b6..01c7e61c 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -71,7 +71,7 @@ create_bootloader() { pushd "${1}" || die "Failed to enter livecd dir ${1}" # while $1/grub is unused here, it triggers grub config building in bootloader-setup.sh - mkdir -p boot/EFI/BOOT grub/fonts isolinux + mkdir -p boot/EFI/BOOT isolinux #create boot.msg for isolinux echo "Gentoo Linux Installation LiveCD http://www.gentoo.org/" > isolinux/boot.msg echo "Enter to boot; F1 for kernels F2 for options." >> isolinux/boot.msg @@ -106,8 +106,6 @@ create_bootloader() { echo "search --no-floppy --set=root --file /livecd" > grub-stub.cfg echo "configfile /grub/grub.cfg" >> grub-stub.cfg - cp /usr/share/grub/unicode.pf2 grub/fonts/ - # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both # set up 32 bit uefi ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"