backupiso: fix boot on EFI

[ipfire-2.x.git] / src / scripts / backupiso

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index caafe92fea54346500695d558ca48c510a15f85f..2b91b5f6a52178e0801e4d96b3f9543da18893a4 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,5 +1,37 @@
 #!/bin/sh
 arch=$(uname -m)
+IPFVER=2.21
+COREVER=$(cat /opt/pakfire/db/core/mine)
+# FIXME: edit this lines before release
+URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
+ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
+
+makeiso() {
+       local dir="${1}"
+       local output="${2}"
+
+       local args=
+
+       # 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 -J -r -V "IPFire ${IPFVER} ${arch}" \
+               -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+               -c boot/isolinux/boot.catalog \
+               ${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)
@@ -16,11 +48,6 @@ case $arch in
                ;;
 esac
 
-COREVER=$(cat /opt/pakfire/db/core/mine)
-# FIXME: edit this lines before release
-URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core$COREVER/"
-ISO="ipfire-2.19.$arch-full-core$COREVER.iso"
-
 if [ -z $1 ]; then
        echo usage: $0 backup-file
        exit
@@ -72,11 +99,11 @@ rm -r backupiso.tmp.${TS}
 # Copy backup file to disk
 cp "/var/ipfire/backup/${TS}.ipf" "backupiso.${TS}/backup.ipf"
 
+# Add a version tag
+touch "backupiso.${TS}/backup-${TS}.media"
+
 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}