From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core66, updated.
 eb7fff99fc287ed76ed39a3d408006bbcf0aabd4
Date: Fri, 15 Feb 2013 19:17:01 +0100
Message-ID: <20130215181716.8F03D200B6@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0832645168119771308=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0832645168119771308==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core66 has been updated
       via  eb7fff99fc287ed76ed39a3d408006bbcf0aabd4 (commit)
      from  2e8b71ca698238b679cc5098fb9f0def8ebf716b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eb7fff99fc287ed76ed39a3d408006bbcf0aabd4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Feb 15 19:15:11 2013 +0100

    backupiso: disable on arm (we have no iso).
   =20
    and fix syntax error.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/backup.cgi | 10 ++++++++--
 src/scripts/backupiso   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 8c93814..830775d 100644
--- 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(a)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=3D'left'>
 		<input type=3D'radio' name=3D'BACKUPLOGS' value=3D'include'/> $Lang::tr{'i=
nclude logfiles'}<br/>
 		<input type=3D'radio' name=3D'BACKUPLOGS' value=3D'exclude' checked=3D'che=
cked'/> $Lang::tr{'exclude logfiles'}<br/>
-		<input type=3D'radio' name=3D'BACKUPLOGS' value=3D'iso' /> $Lang::tr{'gene=
rate iso'}
+END
+;
+my $MACHINE=3D`uname -m`;
+if ( ! ( $MACHINE =3D~ "arm" )) {
+	print"		<input type=3D'radio' name=3D'BACKUPLOGS' value=3D'iso' /> $Lang::t=
r{'generate iso'}<br/>"
+}
+print <<END
 	</td>
 </tr>
 <tr><td align=3D'center' colspan=3D'2'>
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 111a350..30616a4 100644
--- 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
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============0832645168119771308==--