Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Fri, 13 Jul 2018 20:00:39
Message-Id: 1531512025.198f3cda78d42dd5864c3819d21c920fa9cd6383.zerochaos@gentoo
1 commit: 198f3cda78d42dd5864c3819d21c920fa9cd6383
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 13 20:00:25 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 13 20:00:25 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=198f3cda
7
8 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
9
10 targets/support/functions.sh | 4 +---
11 1 file changed, 1 insertion(+), 3 deletions(-)
12
13 diff --git a/targets/support/functions.sh b/targets/support/functions.sh
14 index 9a7441b6..01c7e61c 100755
15 --- a/targets/support/functions.sh
16 +++ b/targets/support/functions.sh
17 @@ -71,7 +71,7 @@ create_bootloader() {
18 pushd "${1}" || die "Failed to enter livecd dir ${1}"
19
20 # while $1/grub is unused here, it triggers grub config building in bootloader-setup.sh
21 - mkdir -p boot/EFI/BOOT grub/fonts isolinux
22 + mkdir -p boot/EFI/BOOT isolinux
23 #create boot.msg for isolinux
24 echo "Gentoo Linux Installation LiveCD http://www.gentoo.org/" > isolinux/boot.msg
25 echo "Enter to boot; F1 for kernels F2 for options." >> isolinux/boot.msg
26 @@ -106,8 +106,6 @@ create_bootloader() {
27 echo "search --no-floppy --set=root --file /livecd" > grub-stub.cfg
28 echo "configfile /grub/grub.cfg" >> grub-stub.cfg
29
30 - cp /usr/share/grub/unicode.pf2 grub/fonts/
31 -
32 # 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
33 # set up 32 bit uefi
34 ${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"