mkimage.sh: pickup new bootx64.efi location
This commit is contained in:
parent
77a0b436af
commit
74a6f22059
|
@ -76,7 +76,10 @@ SOURCE=$(readlink -e "$1")
|
||||||
IMAGE=$(readlink -f "$2")
|
IMAGE=$(readlink -f "$2")
|
||||||
|
|
||||||
if ! [[ -d $SOURCE ]]; then
|
if ! [[ -d $SOURCE ]]; then
|
||||||
|
NAME="$(jq -r '.name' "$SOURCE")"
|
||||||
SOURCE="${SOURCE%/*}/$(jq -r '.name' "$SOURCE")-$(jq -r '.version' "$SOURCE")"
|
SOURCE="${SOURCE%/*}/$(jq -r '.name' "$SOURCE")-$(jq -r '.version' "$SOURCE")"
|
||||||
|
else
|
||||||
|
NAME="$(jq -r '.name' "$SOURCE"/release.json)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [[ -d $SOURCE ]] || ! [[ $IMAGE ]]; then
|
if ! [[ -d $SOURCE ]] || ! [[ $IMAGE ]]; then
|
||||||
|
@ -172,10 +175,10 @@ if [[ $USE_EFISHELL ]]; then
|
||||||
[[ -e "${SOURCE}"/efi/startup.nsh ]] && cp "${SOURCE}"/efi/startup.nsh "$MY_TMPDIR"/boot/
|
[[ -e "${SOURCE}"/efi/startup.nsh ]] && cp "${SOURCE}"/efi/startup.nsh "$MY_TMPDIR"/boot/
|
||||||
[[ -e "${SOURCE}"/efi/LockDown.efi ]] && cp "${SOURCE}"/efi/LockDown.efi "$MY_TMPDIR"/boot/
|
[[ -e "${SOURCE}"/efi/LockDown.efi ]] && cp "${SOURCE}"/efi/LockDown.efi "$MY_TMPDIR"/boot/
|
||||||
cp "${SOURCE}"/efi/Shell.efi "$MY_TMPDIR"/boot/EFI/Boot/bootx64.efi
|
cp "${SOURCE}"/efi/Shell.efi "$MY_TMPDIR"/boot/EFI/Boot/bootx64.efi
|
||||||
cp "$SOURCE"/efi/EFI/Boot/bootx64.efi "$MY_TMPDIR"/boot/EFI/FedoraBook/1.efi
|
cp "$SOURCE"/efi/EFI/${NAME}/bootx64.efi "$MY_TMPDIR"/boot/EFI/FedoraBook/1.efi
|
||||||
else
|
else
|
||||||
cp "$SOURCE"/efi/EFI/Boot/bootx64.efi "$MY_TMPDIR"/boot/EFI/Boot/bootx64.efi
|
cp "$SOURCE"/efi/EFI/${NAME}/bootx64.efi "$MY_TMPDIR"/boot/EFI/Boot/bootx64.efi
|
||||||
cp "$SOURCE"/efi/EFI/Boot/bootx64.efi "$MY_TMPDIR"/boot/EFI/FedoraBook/1.efi
|
cp "$SOURCE"/efi/EFI/${NAME}/bootx64.efi "$MY_TMPDIR"/boot/EFI/FedoraBook/1.efi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
umount "$MY_TMPDIR"/boot
|
umount "$MY_TMPDIR"/boot
|
||||||
|
|
Loading…
Reference in a new issue