backupiso: disable on arm (we have no iso).

and fix syntax error.

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 8c938149642380152562767a4752bf0309fc3529..830775ddf5f99df71292a9ea74fe2ad975dc6cb8 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
+# Copyright (C) 2005-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -176,7 +176,13 @@ print <<END
        <td align='left'>
                <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
                <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
-               <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}
+END
+;
+my $MACHINE=`uname -m`;
+if ( ! ( $MACHINE =~ "arm" )) {
+       print"          <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}<br/>"
+}
+print <<END
        </td>
 </tr>
 <tr><td align='center' colspan='2'>

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 111a350301eb47d0709db30f3f8d459b7edd9c76..30616a4a5a48277487133a21aae1776eb77122a6 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -19,7 +19,8 @@ if [ ! -e ${ISO} ]
 then
        echo "Fetching ${URL}${ISO}"
        wget --quiet -c ${URL}${ISO}
-else
+fi
+
 echo "Fetching ${URL}${ISO}.md5"
 wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5