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: Mon, 16 Jul 2018 16:25:07
Message-Id: 1531758242.e9587331f003752a7e89f6322efc14ee09a182b7.zerochaos@gentoo
1 commit: e9587331f003752a7e89f6322efc14ee09a182b7
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 16 16:24:02 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 16 16:24:02 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9587331
7
8 prefer /boot/EFI
9
10 users can setup whatever they want in cdtar and it's valid, but because
11 linux is case sensative we are simply going to prefer /boot/EFI over
12 /boot/efi
13
14 targets/support/create-iso.sh | 4 ++++
15 1 file changed, 4 insertions(+)
16
17 diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
18 index dcf18d76..3d069ed3 100755
19 --- a/targets/support/create-iso.sh
20 +++ b/targets/support/create-iso.sh
21 @@ -269,6 +269,10 @@ case ${clst_hostarch} in
22 mkdir -p "${clst_target_path}"/boot
23 else
24 echo "Preparing EFI boot image"
25 + if [ -d "${clst_target_path}/boot/efi" ] && [ ! -d "${clst_target_path}/boot/EFI" ]; then
26 + echo "Moving /boot/efi to /boot/EFI"
27 + mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI"
28 + fi
29 # prepare gentoo.efimg from clst_target_path /boot/EFI dir
30 iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
31 iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)