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 87EAC138334 for ; Fri, 13 Jul 2018 18:12:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65753E08F5; Fri, 13 Jul 2018 18:12:02 +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 1E074E08F5 for ; Fri, 13 Jul 2018 18:11:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 320C4335C94 for ; Fri, 13 Jul 2018 18:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C8972E5 for ; Fri, 13 Jul 2018 18:11:54 +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: <1531505506.39d0c84674a703154314b5196beefc10f6cec99d.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: 39d0c84674a703154314b5196beefc10f6cec99d X-VCS-Branch: master Date: Fri, 13 Jul 2018 18:11:54 +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: 6557ff30-d998-4f77-85a2-96959ae07c0e X-Archives-Hash: 40ddbeba7a9107773da361c1f9329aba commit: 39d0c84674a703154314b5196beefc10f6cec99d Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Fri Jul 13 18:11:46 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Fri Jul 13 18:11:46 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=39d0c846 based on testing by iamben and myself, these files are in the grub standalone image and not required on the livecd targets/support/functions.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index d4834a2d..9a7441b6 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -110,16 +110,12 @@ create_bootloader() { # 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 - mkdir -p grub/i386-efi - cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/ ${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" #secure boot shim cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/ cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/ #set up 64 bit uefi - mkdir -p grub/x86_64-efi - cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/ ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi" #secure boot shim cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/