X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fscripts%2Fbackupiso;h=fb203bd2a7cacb11471e425a5a057d69a81eda78;hb=601f8347ccb1e9c5e3f250ff26d4097ecd698875;hp=ba1725213a2a4b7a7f2275ccad1e973d58d93ec0;hpb=3df6d96c8f208edd62e978cb621f16c028364a29;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index ba1725213a..fb203bd2a7 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,12 +1,11 @@
 #!/bin/sh
 
+COREVER=$(cat /opt/pakfire/db/core/mine)
 # FIXME: edit this lines before release
-URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.3.i586-full.iso
-#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
-#ISO=ipfire-2.3-test.i586-full.iso
+URL="http://download.ipfire.org/releases/ipfire-2.x/2.15-core$COREVER/"
+ISO="ipfire-2.15.i586-full-core$COREVER.iso"
 
-if [ -z "$1" ]; then 
+if [ -z $1 ]; then
 	echo usage: $0 backup-file
 	exit
 fi
@@ -16,22 +15,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 [ ! -e ${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 -o $? -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 -o $? -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}
@@ -40,13 +53,14 @@ 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
+            -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso
+isohybrid $(basename ${ISO} .iso)-${TS}.iso
 
 echo "Cleaning up"
 rm -rf backupiso.${TS}