core186: Ship ovpnmain.cgi

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

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index fe53767417f86c993fa30f9400f7f1a29129880e..8e1af411dd817311070fb980ed2ae60fca206222 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -20,7 +20,7 @@
 ###############################################################################
 
 # FIXME: edit this lines before release
-IPFVER=2.27
+IPFVER=2.29
 COREVER=$(cat /opt/pakfire/db/core/mine)
 
 arch=$(uname -m)
@@ -35,7 +35,7 @@ case "${arch}" in
 esac
 
 URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
-ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
+ISO="ipfire-$IPFVER-core$COREVER-$arch.iso"
 
 makeiso() {
        local dir="${1}"
@@ -80,30 +80,30 @@ then
        wget --quiet -c ${URL}${ISO}
 fi
 
-echo "Fetching ${URL}${ISO}.md5"
-wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5
+echo "Fetching ${URL}${ISO}.b2"
+wget --quiet -O ${ISO}.b2 ${URL}${ISO}.b2
 
-echo "Checking md5 of ${ISO}"
-md5sum --status -c ${ISO}.md5
+echo "Checking BLAKE2 checksum of ${ISO}"
+b2sum --status -c ${ISO}.b2
 if [ $? -eq 0 ] || [ $? -eq 24 ]
 then
-       echo "md5 is OK"
+       echo "BLAKE2 checksum is OK"
 else
-       echo "md5 mismatch"
+       echo "BLAKE2 checksum mismatch"
        echo "Fetching again ${URL}${ISO}"
        wget --quiet -O ${ISO} ${URL}${ISO}
-       echo "Checking again md5 of ${ISO}"
-       md5sum --status -c ${ISO}.md5
+       echo "Checking BLAKE2 checksum of ${ISO} again"
+       b2sum --status -c ${ISO}.b2
        if [ $? -eq 0 ] || [ $? -eq 24 ]
        then
-               echo "md5 is OK"
+               echo "BLAKE2 checksum is OK"
        else
-               echo "md5 mismatch"
-               echo "aborting backup because md5 mismatch"
+               echo "BLAKE2 checksum mismatch"
+               echo "aborting backup because BLAKE2 checksum mismatch"
                exit 1
        fi
 fi
-rm ${ISO}.md5
+rm ${ISO}.b2
 
 echo "Remastering iso"
 mkdir -p backupiso.tmp.${TS}