backup: fix backupiso mastering

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

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 72e6a0b4b32ad7499e1f1f0ba3410cb1857b1f49..d4df6d2c6a20178556e219ad578ea49e80cb2a5a 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,11 +1,54 @@
 #!/bin/sh
+arch=$(uname -m)
 
-COREVER=`cat /opt/pakfire/db/core/mine`
+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/iso/
-ISO=ipfire-2.9.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 
+if [ -z $1 ]; then
        echo usage: $0 backup-file
        exit
 fi
@@ -15,22 +58,36 @@ TS=$1
 mkdir -p /var/tmp/backupiso
 cd /var/tmp/backupiso
 
-echo "Fetching ${URL}${ISO}"
-wget --quiet -c ${URL}${ISO}
-echo "Fetching ${URL}md5sums.txt"
+if [ ! -f ${ISO} ]
+then
+       echo "Fetching ${URL}${ISO}"
+       wget --quiet -c ${URL}${ISO}
+fi
+
+echo "Fetching ${URL}${ISO}.md5"
 wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5
 
 echo "Checking md5 of ${ISO}"
 md5sum --status -c ${ISO}.md5
-RETVAR="$?"
-if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ]
-       then
-                echo "md5 is OK"
-       else
-                echo "md5 mismatch"
-               echo "Fetching again ${URL}${ISO}"
-               wget --quiet -O ${ISO} ${URL}${ISO}
+if [ $? -eq 0 ] || [ $? -eq 24 ]
+then
+       echo "md5 is OK"
+else
+       echo "md5 mismatch"
+       echo "Fetching again ${URL}${ISO}"
+       wget --quiet -O ${ISO} ${URL}${ISO}
+       echo "Checking again md5 of ${ISO}"
+       md5sum --status -c ${ISO}.md5
+       if [ $? -eq 0 ] || [ $? -eq 24 ]
+       then
+               echo "md5 is OK"
+       else
+               echo "md5 mismatch"
+               echo "aborting backup because md5 mismatch"
+               exit 1
+       fi
 fi
+rm ${ISO}.md5
 
 echo "Remastering iso"
 mkdir -p backupiso.tmp.${TS}
@@ -39,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}