This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, efi has been updated via 87589bce0019b92911fab529b3a010a50cbdaa04 (commit) from de7c8df83e23e82a4b757b6283ae06d2cd8eb14f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 87589bce0019b92911fab529b3a010a50cbdaa04 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 31 16:36:09 2018 +0100
backup: Make backup ISO bootable on EFI
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: src/scripts/backupiso | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
Difference in files: diff --git a/src/scripts/backupiso b/src/scripts/backupiso index caafe92fe..4655f7e4a 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,6 +1,32 @@ #!/bin/sh arch=$(uname -m)
+makeiso() { + local dir="${1}" + local output="${2}" + + local args="-J -r -V 'ipfire backup ${TS}' \ + -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ + -c boot/isolinux/boot.catalog" + + # Add EFI options when EFI image is present + if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then + args="${args} -eltorito-alt-boot -e boot/isolinux/efiboot.img -no-emul-boot" + fi + + # Compose ISO + mkisofs ${args} ${dir} > ${output} + + # Add DOS paritition table + if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then + isohybrid --uefi ${output} + else + isohybrid ${output} + fi + + return 0 +} + case $arch in i?86) arch="i586" @@ -73,10 +99,7 @@ rm -r backupiso.tmp.${TS} cp "/var/ipfire/backup/${TS}.ipf" "backupiso.${TS}/backup.ipf"
echo "Running mkisofs" -mkisofs -J -r -V "ipfire backup ${TS}" \ - -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ - -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso -isohybrid $(basename ${ISO} .iso)-${TS}.iso +makeiso backupiso.${TS} $(basename ${ISO} .iso)-${TS}.iso
echo "Cleaning up" rm -rf backupiso.${TS}
hooks/post-receive -- IPFire 2.x development tree