diffstat of debian/ for live-build_4.0.3-1 live-build_4.0.3-1tanglu2 changelog | 81 +++++++ patches/01_win32-loader-path.patch | 11 + patches/02_fix-resolvconf-truncate.patch | 26 ++ patches/03_fix-isolinux-install.patch | 13 + patches/04_remove_elilo_on_i386.diff | 11 + patches/05_tanglu-mode.patch | 175 ++++++++++++++++ patches/06_add-efi-support.patch | 339 +++++++++++++++++++++++++++++++ patches/series | 6 rules | 1 9 files changed, 663 insertions(+) --- live-build-4.0.3/debian/changelog 2014-10-25 12:40:09.000000000 +0000 +++ live-build-4.0.3/debian/changelog 2014-11-27 00:49:13.000000000 +0000 @@ -1,3 +1,28 @@ +live-build (4.0.3-1tanglu2) staging; urgency=medium + + * Add x permission to binary_efi script + * Detect the right architecture in EFI script + * Refresh patches + + -- Matthias Klumpp Thu, 27 Nov 2014 10:46:48 +0100 + +live-build (4.0.3-1tanglu1) staging; urgency=medium + + * Merge with Debian unstable, remaining changes: + - win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + - fix-resolvconf-truncate.patch: Ensure host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the + host resolv.conf + - fix-isolinux-install.patch: Make sure isolinux is installed if + it's used as bootloader + - remove_elilo_on_i386.diff: Remove elilo from the required + packages on i386. It's gone from bartholomea + - tanglu-mode.patch: Add support for Tanglu + - add-efi-support.patch: Add support for UEFI + + -- Matthias Klumpp Wed, 26 Nov 2014 19:38:50 +0100 + live-build (4.0.3-1) unstable; urgency=low [ Richard Nelson ] @@ -73,6 +98,50 @@ -- Daniel Baumann Thu, 24 Jul 2014 05:05:17 +0200 +live-build (4.0~alpha38-1tanglu6) staging; urgency=medium + + * Set some defaults for Tanglu + + -- Matthias Klumpp Mon, 24 Nov 2014 22:28:50 +0100 + +live-build (4.0~alpha38-1tanglu5) staging; urgency=medium + + * Add Tanglu mode + * {binary|source}_disk: Add support for Tanglu + + -- Matthias Klumpp Mon, 24 Nov 2014 14:12:38 +0100 + +live-build (4.0~alpha38-1tanglu4) staging; urgency=medium + + * Add 05_remove_elilo_on_i386.diff to remove elilo from the required + packages on i386. It's gone from bartholomea + + -- Philip Muškovac Sat, 08 Nov 2014 21:40:24 +0100 + +live-build (4.0~alpha38-1tanglu3) staging; urgency=medium + + * Add 04_fix-isolinux-install.patch to make sure isolinux is installed if + it's used as bootloader + + -- Philip Muškovac Tue, 08 Jul 2014 01:35:35 +0200 + +live-build (4.0~alpha38-1tanglu2) staging; urgency=medium + + * Cherry pick 6cfcbbb as upstream_6cfcbbb.diff to fix syslinux 6 support + + -- Philip Muškovac Mon, 30 Jun 2014 22:42:53 +0200 + +live-build (4.0~alpha38-1tanglu1) staging; urgency=medium + + * Merge with debian unstable, remaining changes: + - Add 03_fix-resolvconf-truncate.patch so the host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the host + resolv.conf + - Add 02_win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + + -- Philip Muškovac Sat, 28 Jun 2014 21:55:19 +0200 + live-build (4.0~alpha38-1) unstable; urgency=low [ Daniel Baumann ] @@ -100,6 +169,17 @@ -- Daniel Baumann Wed, 25 Jun 2014 21:04:46 +0200 +live-build (4.0~alpha37-1tanglu1) staging; urgency=low + + * Merge with debian unstable, remaining changes: + - Add 03_fix-resolvconf-truncate.patch so the host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the host + resolv.conf + - Add 02_win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + + -- Valentin OVD Mon, 09 Jun 2014 12:01:35 +0200 + live-build (4.0~alpha37-1) unstable; urgency=low * Updating default boot parameters for live-config 4.x. @@ -6183,3 +6263,4 @@ * Initial release. -- Daniel Baumann Mon, 17 Jul 2006 00:00:00 +0200 + --- live-build-4.0.3/debian/patches/01_win32-loader-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/01_win32-loader-path.patch 2014-06-09 10:20:46.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/binary_win32-loader ++++ b/scripts/build/binary_win32-loader +@@ -59,7 +59,7 @@ + # Copying win32-loader + cp -r chroot/usr/share/win32/* binary + else +- cp -r usr/share/win32/* binary ++ cp -r /usr/share/win32/* binary + fi + + mv binary/win32-loader.exe binary/setup.exe --- live-build-4.0.3/debian/patches/02_fix-resolvconf-truncate.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/02_fix-resolvconf-truncate.patch 2014-11-27 00:47:46.000000000 +0000 @@ -0,0 +1,26 @@ +--- a/scripts/build/chroot_resolv ++++ b/scripts/build/chroot_resolv +@@ -40,7 +40,11 @@ + # Creating lock file + Create_lockfile .lock + +- if [ -e chroot/etc/resolv.conf ] ++ if [ -L chroot/etc/resolv.conf ] ++ then ++ # Move resolv.conf aside if it's a symlink (likely resolvconf) ++ mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig ++ elif [ -e chroot/etc/resolv.conf ] + then + # Save resolv file or symlink + mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig +@@ -51,10 +55,6 @@ + # If you want to have a custom resolv.conf, please + # overwrite it with normal local_includes mechanism. + Truncate chroot/etc/resolv.conf.orig +- elif [ -L chroot/etc/resolv.conf ] +- then +- # Move resolv.conf aside if it's a symlink (likely resolvconf) +- mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig + fi + + if [ -f /etc/resolv.conf ] --- live-build-4.0.3/debian/patches/03_fix-isolinux-install.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/03_fix-isolinux-install.patch 2014-11-27 00:47:44.000000000 +0000 @@ -0,0 +1,13 @@ +--- a/scripts/build/binary_syslinux ++++ b/scripts/build/binary_syslinux +@@ -148,6 +148,10 @@ + ;; + esac + ++ if [ "${_BOOTLOADER}" = "isolinux" ]; then ++ Check_package chroot/usr/lib/ISOLINUX isolinux ++ fi ++ + Check_package chroot/usr/lib/syslinux syslinux-common + + if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 --- live-build-4.0.3/debian/patches/04_remove_elilo_on_i386.diff 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/04_remove_elilo_on_i386.diff 2014-11-27 00:47:40.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/installer_debian-installer ++++ b/scripts/build/installer_debian-installer +@@ -353,7 +353,7 @@ + ;; + + i386) +- DI_REQ_PACKAGES="elilo lilo grub-pc" ++ DI_REQ_PACKAGES="lilo grub-pc" + + case "${LB_MODE}" in + ubuntu) --- live-build-4.0.3/debian/patches/05_tanglu-mode.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/05_tanglu-mode.patch 2014-11-27 00:47:37.000000000 +0000 @@ -0,0 +1,175 @@ +Description: Add Tanglu mode + * {binary|source}_disk: Add support for Tanglu +Author: Matthias Klumpp + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- a/scripts/build/binary_disk ++++ b/scripts/build/binary_disk +@@ -66,6 +66,12 @@ + TRACE="" + ;; + ++ tanglu) ++ TITLE="Tanglu" ++ STRING="Build ${ARCHITECTURE}" ++ TRACE="" ++ ;; ++ + progress-linux) + TITLE="Progress Linux" + STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" +--- a/scripts/build/binary_syslinux ++++ b/scripts/build/binary_syslinux +@@ -312,6 +312,10 @@ + _PROJECT="Progress Linux" + ;; + ++ tanglu) ++ _PROJECT="Tanglu" ++ ;; ++ + *) + _PROJECT="Debian GNU/Linux" + ;; +--- a/scripts/build/chroot_archives ++++ b/scripts/build/chroot_archives +@@ -86,7 +86,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +@@ -578,7 +578,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +--- a/scripts/build/source_disk ++++ b/scripts/build/source_disk +@@ -66,6 +66,12 @@ + TRACE="" + ;; + ++ tanglu) ++ TITLE="Tanglu" ++ STRING="Build ${ARCHITECTURE}" ++ TRACE="" ++ ;; ++ + progress-linux) + TITLE="Progress Linux" + STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" +--- a/scripts/build/bootstrap_archives ++++ b/scripts/build/bootstrap_archives +@@ -85,7 +85,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +--- a/functions/releases.sh ++++ b/functions/releases.sh +@@ -22,3 +22,7 @@ + RELEASE_precise="12.04" # LTS: 2017-04-01 + RELEASE_quantal="12.10" # 2014-04-01 + RELEASE_raring="13.04" # 2014-10-01 ++ ++# Tanglu releases ++RELEASE_aequorea="1" ++RELEASE_bartholomea="2" +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -102,7 +102,7 @@ + _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" + + case "${_DISTRIBUTOR}" in +- debian|progress-linux|ubuntu) ++ debian|progress-linux|ubuntu|tanglu) + LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}" + ;; + +@@ -285,6 +285,18 @@ + esac + ;; + ++ tanglu) ++ case "${LB_SYSTEM}" in ++ live) ++ LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" ++ ;; ++ ++ normal) ++ LB_INITSYSTEM="${LB_INITSYSTEM:-none}" ++ ;; ++ esac ++ ;; ++ + *) + case "${LB_SYSTEM}" in + live) +@@ -377,6 +389,11 @@ + LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" + ;; + ++ tanglu) ++ LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.tanglu.org/tanglu/}" ++ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" ++ ;; ++ + progress-linux) + LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}" + LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}" +@@ -439,6 +456,11 @@ + LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" + ;; + ++ tanglu) ++ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://archive.tanglu.org/tanglu/}" ++ LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" ++ ;; ++ + ubuntu) + case "${LIVE_IMAGE_ARCHITECTURE}" in + amd64|i386) +@@ -840,6 +862,10 @@ + LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}" + ;; + ++ tanglu) ++ LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Tanglu Live}" ++ ;; ++ + ubuntu) + LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}" + ;; +@@ -897,7 +923,7 @@ + + # Setting loadlin option + case "${LB_MODE}" in +- progress-linux|ubuntu) ++ progress-linux|ubuntu|tanglu) + + ;; + --- live-build-4.0.3/debian/patches/06_add-efi-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0.3/debian/patches/06_add-efi-support.patch 2014-11-27 00:47:22.000000000 +0000 @@ -0,0 +1,339 @@ +Description: Add support for EFI boot + Note that this patch relies on syslinux 6 packaged sanely (i.e. + respecting upstream file locations), such a package only exists in + Kali for now... the experimental package in Debian places files + in new directories (see #742836). +Author: Raphaël Hertzog +Bug-Debian: http://bugs.debian.org/731709 +Bug-Kali: https://bugs.kali.org/view.php?id=680 + +--- a/scripts/build/binary ++++ b/scripts/build/binary +@@ -69,6 +69,10 @@ + lb binary_win32-loader ${@} + lb binary_includes ${@} + lb binary_hooks ${@} ++lb binary_efi ${@} # After includes/hooks because it copies in efi.img ++ # files that can be overriden by binary_includes and ++ # modified by binary_hooks ++ + lb binary_checksums ${@} + + if [ "${LB_BUILD_WITH_CHROOT}" != "true" ] +--- a/scripts/build/binary_iso ++++ b/scripts/build/binary_iso +@@ -82,6 +82,23 @@ + # Handle xorriso generic options + XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes" + ++case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ XORRISO_VER=$(Chroot chroot xorriso --version 2>&1 | awk ' ++ /^xorriso version/ { ++ split($4, ver, ".") ++ print ver[1]*10000+ver[2]*100+ver[3] ++ }') ++ ;; ++ false) ++ XORRISO_VER=$(xorriso --version 2>&1 | awk ' ++ /^xorriso version/ { ++ split($4, ver, ".") ++ print ver[1]*10000+ver[2]*100+ver[3] ++ }') ++ ;; ++esac ++ + # Handle xorriso live-build specific options + if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ] + then +@@ -155,6 +172,26 @@ + ;; + esac + ++if [ -e binary/boot/efi.img ]; then ++ #if [ "$XORRISO_VER" -le 10202 ]; then ++ # 1.2.2 shipping in wheezy ++ Echo "Using older EFI command line for xorriso $XORRISO_VER" ++ # Tell xorriso to create a secondary ElTorito boot record for the ++ # EFI bootloader ++ XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot --efi-boot boot/efi.img" ++ # Add the efi image as a FAT partition too, so our CD image will ++ # also boot on a USB key (like isohybrid, just implemented ++ # differently) ++ XORRISO_OPTIONS="${XORRISO_OPTIONS} -append_partition 2 0x01 binary/boot/efi.img" ++ #else ++ # Echo "Using newer EFI support in xorriso $XORRISO_VER" ++ # XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/efi.img -no-emul-boot" ++ # XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat" ++ #fi ++else ++ Echo "No EFI boot code to include in the ISO" ++fi ++ + #if [ "${LB_DEBIAN_INSTALLER}" != "live" ] + #then + # XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}" +--- /dev/null ++++ b/scripts/build/binary_efi +@@ -0,0 +1,261 @@ ++#!/bin/sh ++ ++## live-build(7) - System Build Scripts ++## Copyright (C) 2014 Raphaël Hertzog ++## Copyright (C) 2014 Ville Korhonen ++## ++## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ++## This is free software, and you are welcome to redistribute it ++## under certain conditions; see COPYING for details. ++ ++ ++set -e ++ ++# Including common functions ++[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh ++ ++# Setting static variables ++DESCRIPTION="$(Echo 'prepares and installs EFI support into binary')" ++HELP="" ++USAGE="${PROGRAM} [--force]" ++ ++Arguments "${@}" ++ ++# Reading configuration files ++Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source ++Set_defaults ++ ++if [ "${LB_BOOTLOADER}" != "syslinux" ] ++then ++ exit 0 ++fi ++ ++Echo_message "Begin preparing EFI support..." ++ ++# Requiring stage file ++Require_stagefile .build/config .build/bootstrap ++ ++# Checking stage file ++Check_stagefile .build/binary_efi ++ ++# Checking lock file ++Check_lockfile .lock ++ ++# Creating lock file ++Create_lockfile .lock ++ ++# Check architecture ++Check_architectures amd64 i386 ++Check_crossarchitectures ++ ++case "${LIVE_IMAGE_ARCHITECTURE}" in ++ amd64) ++ _EFI_TYPE=efi64 ++ ;; ++ i386) ++ _EFI_TYPE=efi32 ++ ;; ++ *) ++ echo "ERROR: can't provide EFI boot support to architecture ${LIVE_IMAGE_ARCHITECTURE}" >&2 ++ exit 0 ++ ;; ++esac ++ ++# Assembling image specifics ++case "${LB_BINARY_IMAGES}" in ++ iso*) ++ _BOOTLOADER="isolinux" ++ ++ case "${LB_MODE}" in ++ progress-linux) ++ _CONFDIR="binary/boot" ++ ;; ++ ++ *) ++ _CONFDIR="binary/isolinux" ++ ;; ++ esac ++ ;; ++ ++ netboot) ++ _BOOTLOADER="pxelinux" ++ _CONFDIR="tftpboot" ++ ;; ++ ++ hdd*|*) ++ _BOOTLOADER="syslinux" ++ ++ case "${LB_MODE}" in ++ progress-linux) ++ _CONFDIR="binary/boot" ++ ;; ++ ++ *) ++ _CONFDIR="binary/syslinux" ++ ;; ++ esac ++ ;; ++esac ++ ++# Checking depends ++case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ _CHROOT_DIR="" ++ _SYSLINUX_EFI_DIR="chroot/usr/lib/SYSLINUX.EFI/$_EFI_TYPE" ++ _SYSLINUX_MODULE_DIR="chroot/usr/lib/syslinux/modules/$_EFI_TYPE" ++ ++ Check_package chroot/usr/bin/syslinux syslinux ++ Check_package chroot/usr/lib/syslinux syslinux-common ++ Check_package chroot/usr/lib/SYSLINUX.EFI syslinux-efi ++ Check_package chroot/usr/bin/mcopy mtools ++ Check_package chroot/sbin/mkfs.msdos dosfstools ++ ;; ++ ++ false) ++ _CHROOT_DIR="chroot" ++ _SYSLINUX_EFI_DIR="/usr/lib/syslinux/$_EFI_TYPE" ++ _SYSLINUX_MODULE_DIR="/usr/lib/syslinux/modules/$_EFI_TYPE" ++ ++ if [ ! -e /usr/bin/syslinux ] ++ then ++ # syslinux ++ Echo_error "/usr/bin/syslinux - no such file." ++ exit 1 ++ fi ++ ++ if [ ! -e /usr/lib/syslinux ] ++ then ++ # syslinux-common ++ Echo_error "/usr/lib/syslinux - no such directory" ++ exit 1 ++ fi ++ ++ if [ ! -e /usr/bin/mcopy ] ++ then ++ # mtools ++ Echo_error "/usr/bin/mcopy - no such file." ++ exit 1 ++ fi ++ ++ if [ ! -e /sbin/mkfs.msdos ] ++ then ++ # dosfstools ++ Echo_error "/sbin/mkfs.msdos - no such file." ++ exit 1 ++ fi ++ ;; ++esac ++ ++# Restoring cache ++Restore_cache cache/packages.binary ++ ++# Installing depends ++Install_package ++ ++# Abort if we don't have the required EFI files ++if [ ! -e $_SYSLINUX_EFI_DIR/syslinux.efi ]; then ++ Echo_warning "$_SYSLINUX_EFI_DIR/syslinux.efi missing, no EFI support included." ++ case "${LB_BUILD_WITH_CHROOT}" in ++ true) ++ # Saving cache ++ Save_cache cache/packages.binary ++ ++ # Removing depends ++ Remove_package ++ ;; ++ esac ++ exit 0 ++fi ++ ++# Cleanup files that we generate ++rm -rf chroot/efi-temp chroot/efi.img binary/boot/efi.img ++ ++# Copy syslinux and its config files in the temporary EFI image ++mkdir -p chroot/efi-temp/live ++mkdir -p chroot/efi-temp/EFI/BOOT ++for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_MODULE_DIR/*.*32 $_SYSLINUX_MODULE_DIR/*.*64; do ++ if [ -e $_F ]; then ++ cp $_F chroot/efi-temp/EFI/BOOT/ ++ fi ++done ++cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/BOOTX64.efi ++cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/syslinux.efi ++ ++# Copy the various kernel images ++cp binary/live/vmlinuz* binary/live/initrd.img* chroot/efi-temp/live/ ++if [ -d binary/install ]; then ++ cp -r binary/install chroot/efi-temp/ ++fi ++ ++# Edit the menu to differentiate the EFI version ++if [ -e chroot/efi-temp/EFI/BOOT/menu.cfg ]; then ++ sed -i -e "s/^menu title/menu title EFI/" chroot/efi-temp/EFI/BOOT/menu.cfg ++else ++ Echo "No menu.cfg file that can be edited to indicate that we boot on EFI!" ++fi ++ ++# Ensure we have a syslinux.cfg ++if [ ! -e chroot/efi-temp/EFI/BOOT/syslinux.cfg ]; then ++ for _F in isolinux.cfg pxelinux.cfg/default extlinux.conf; do ++ if [ -f chroot/efi-temp/EFI/BOOT/$_F ]; then ++ cp chroot/efi-temp/EFI/BOOT/$_F chroot/efi-temp/EFI/BOOT/syslinux.cfg ++ break ++ fi ++ done ++fi ++ ++# Define the EFI filesystem size ++_TOTALSIZE=$(du -sk chroot/efi-temp/ | awk '{print $1}') ++# Add 5% safety margin ++_TOTALSIZE=$(( $_TOTALSIZE * 21 / 20 )) ++# Required size rounded to upper 32kb ++_BLOCKS=$(( ($_TOTALSIZE + 31) / 32 * 32 )) ++Echo "EFI boot image needs $_TOTALSIZE Kb, thus allocating $_BLOCKS blocks." ++ ++# Script to generate the EFI boot image ++cat >binary.sh <