backup: fix backupiso mastering

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

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 30616a4a5a48277487133a21aae1776eb77122a6..d4df6d2c6a20178556e219ad578ea49e80cb2a5a 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,9 +1,52 @@
 #!/bin/sh
+arch=$(uname -m)
+
+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 backup ${TS}" \
+               -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)
+               arch="i586"
+               echo "Your arch is $arch"
+               ;;
+       x86_64)
+               arch="x86_64"
+               echo "Your arch is $arch"
+               ;;
+       *)
+               echo "Arch is not supported"
+               exit 1
+               ;;
+esac
 
 COREVER=$(cat /opt/pakfire/db/core/mine)
 # FIXME: edit this lines before release
-URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/"
-ISO="ipfire-2.13.i586-full-core$COREVER.iso"
+URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core$COREVER/"
+ISO="ipfire-2.21.$arch-full-core$COREVER.iso"
 
 if [ -z $1 ]; then
        echo usage: $0 backup-file
@@ -15,7 +58,7 @@ TS=$1
 mkdir -p /var/tmp/backupiso
 cd /var/tmp/backupiso
 
-if [ ! -e ${ISO} ]
+if [ ! -f ${ISO} ]
 then
        echo "Fetching ${URL}${ISO}"
        wget --quiet -c ${URL}${ISO}
@@ -26,7 +69,7 @@ wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5
 
 echo "Checking md5 of ${ISO}"
 md5sum --status -c ${ISO}.md5
-if [ $? -eq 0 -o $? -eq 24 ]
+if [ $? -eq 0 ] || [ $? -eq 24 ]
 then
        echo "md5 is OK"
 else
@@ -35,7 +78,7 @@ else
        wget --quiet -O ${ISO} ${URL}${ISO}
        echo "Checking again md5 of ${ISO}"
        md5sum --status -c ${ISO}.md5
-       if [ $? -eq 0 -o $? -eq 24 ]
+       if [ $? -eq 0 ] || [ $? -eq 24 ]
        then
                echo "md5 is OK"
        else
@@ -53,13 +96,11 @@ cp -pr backupiso.tmp.${TS} backupiso.${TS}
 umount backupiso.tmp.${TS}
 rm -r backupiso.tmp.${TS}
 
-echo "RESTORE_FILE=${TS}.ipf" >> backupiso.${TS}/boot/unattended.conf
-cp /var/ipfire/backup/${TS}.ipf backupiso.${TS}
+# Copy backup file to disk
+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
+makeiso backupiso.${TS} $(basename ${ISO} .iso)-${TS}.iso
 
 echo "Cleaning up"
 rm -rf backupiso.${TS}