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 30CBA138334 for ; Fri, 21 Dec 2018 14:15:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45B2FE0C64; Fri, 21 Dec 2018 14:14:48 +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 1E0DAE0C64 for ; Fri, 21 Dec 2018 14:14:48 +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 393CD335C8C for ; Fri, 21 Dec 2018 14:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 986CD445 for ; Fri, 21 Dec 2018 14:14:43 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1545401560.8a70e1ec82d1dbe29b8edf69514a5073ecc1ed71.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/create-iso.sh X-VCS-Directories: targets/support/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 8a70e1ec82d1dbe29b8edf69514a5073ecc1ed71 X-VCS-Branch: master Date: Fri, 21 Dec 2018 14:14:43 +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: 1242946f-0151-4474-80cf-c2f94cc55fb4 X-Archives-Hash: e973e40a4ba052b74f93d4b679a50aca commit: 8a70e1ec82d1dbe29b8edf69514a5073ecc1ed71 Author: Ben Kohler gentoo org> AuthorDate: Fri Dec 21 14:12:40 2018 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Dec 21 14:12:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8a70e1ec create-iso.sh: copy EFI files onto iso root for vfat/usb compatibility Tools like rufus & unetbootin will take our iso9660 FS contents & put them onto a device with real (msdos or gpt) partitions and a vfat filesystem. For EFI boot, this means the new FS must contain the EFI boot images. The ones we have embedded into the iso (el torito) boot sector will be lost. This commit makes sure /EFI is available on the iso image root, so that it's usable for EFI boot after vfat conversion. Signed-off-by: Ben Kohler gentoo.org> targets/support/create-iso.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 1637c2ea..253a8887 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -274,7 +274,10 @@ case ${clst_hostarch} in umount "${clst_target_path}/gentoo.efimg.mountPoint" rmdir "${clst_target_path}/gentoo.efimg.mountPoint" - echo "Removing /boot contents" + echo "Copying /boot/EFI to /EFI for rufus compatability" + cp -rv "${clst_target_path}"/boot/EFI/ "${clst_target_path}" + + echo "Emptying /boot" rm -rf "${clst_target_path}"/boot mkdir -p "${clst_target_path}"/boot fi