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 3BCD4138334 for ; Mon, 16 Jul 2018 16:25:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D88AFE0819; Mon, 16 Jul 2018 16:25:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AF07AE0819 for ; Mon, 16 Jul 2018 16:25:05 +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 95CB0335C2B for ; Mon, 16 Jul 2018 16:25:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0D61349 for ; Mon, 16 Jul 2018 16:25:01 +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: <1531758242.e9587331f003752a7e89f6322efc14ee09a182b7.zerochaos@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: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: e9587331f003752a7e89f6322efc14ee09a182b7 X-VCS-Branch: master Date: Mon, 16 Jul 2018 16:25:01 +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: f49819e1-d5c5-4bac-8917-1ab0e16304c7 X-Archives-Hash: af97fbd1157660c2eaeaaa90acbe7d66 commit: e9587331f003752a7e89f6322efc14ee09a182b7 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Mon Jul 16 16:24:02 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon Jul 16 16:24:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9587331 prefer /boot/EFI users can setup whatever they want in cdtar and it's valid, but because linux is case sensative we are simply going to prefer /boot/EFI over /boot/efi targets/support/create-iso.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index dcf18d76..3d069ed3 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -269,6 +269,10 @@ case ${clst_hostarch} in mkdir -p "${clst_target_path}"/boot else echo "Preparing EFI boot image" + if [ -d "${clst_target_path}/boot/efi" ] && [ ! -d "${clst_target_path}/boot/EFI" ]; then + echo "Moving /boot/efi to /boot/EFI" + mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI" + fi # prepare gentoo.efimg from clst_target_path /boot/EFI dir iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null) iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)