summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-08 00:23:45 +0000
committerintrigeri <intrigeri@boum.org>2015-05-08 14:42:33 +0000
commit11f460d5e9006455edc3869bcb8bdd0a4ed61efd (patch)
tree12c49e4f00eac19e8b75360ee5d694ba14c587a7 /config/binary_local-hooks
parentba2c4f5ebca3940229e032fb61aedd7127cc1bae (diff)
Revert "Also install the syslinux 32-bit UEFI boot loader."
This reverts commit 441892f6197efbe014cfb54fc6f9d43ed7e425bb. The two 32-bit UEFI systems I've tried booting on only support the fallback UEFI path, that's not an option for us with 32-bit syslinux UEFI, as explained in the commit we're presently reverting. I also tried, and failed, to convince GRUB2 installed in the fallback location (EFI/BOOT/bootia32.efi) to chainload into 32-bit syslinux UEFI. So I'm giving up with using syslinux for 32-bit UEFI. Refs: #8471
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/99-syslinux_uefi35
1 files changed, 7 insertions, 28 deletions
diff --git a/config/binary_local-hooks/99-syslinux_uefi b/config/binary_local-hooks/99-syslinux_uefi
index ad4ef2f..d67c69f 100755
--- a/config/binary_local-hooks/99-syslinux_uefi
+++ b/config/binary_local-hooks/99-syslinux_uefi
@@ -31,31 +31,10 @@ case "${LB_BINARY_IMAGES}" in
;;
esac
-### Main
-
-## 64-bit
-for bit in 32 64 ; do
- case "$bit" in
- 32)
- TARGET_SUBDIR=TAILS32
- BOOTLOADER_NAME=bootia32
- SYSLINUX_SUBDIR=efi32
- ;;
- 64)
- TARGET_SUBDIR=BOOT
- BOOTLOADER_NAME=bootx64
- SYSLINUX_SUBDIR=efi64
- ;;
- esac
- TARGET_DIR="binary/EFI/${TARGET_SUBDIR}"
- mkdir -p "${TARGET_DIR}"
- cp "chroot/usr/lib/SYSLINUX.EFI/${SYSLINUX_SUBDIR}/syslinux.efi" \
- "${TARGET_DIR}/${BOOTLOADER_NAME}.efi"
- cp chroot/usr/share/tails/bootx64.png \
- "${TARGET_DIR}/${BOOTLOADER_NAME}.png"
- cp "$SYSLINUX_PATH"/* "${TARGET_DIR}"
- cp -f "chroot/usr/lib/syslinux/modules/${SYSLINUX_SUBDIR}/"* \
- "${TARGET_DIR}"
- sed -r -i -e 's,^(menu background splash\.png)$,\#\1,' \
- "${TARGET_DIR}/stdmenu.cfg"
-done
+# Main
+mkdir -p binary/EFI/BOOT
+cp chroot/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi binary/EFI/BOOT/bootx64.efi
+cp chroot/usr/share/tails/bootx64.png binary/EFI/BOOT/
+cp "$SYSLINUX_PATH"/* binary/EFI/BOOT/
+cp -f chroot/usr/lib/syslinux/modules/efi64/* binary/EFI/BOOT/
+sed -r -i -e 's,^(menu background splash\.png)$,\#\1,' binary/EFI/BOOT/stdmenu.cfg