[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 30086585ed63e0e1a3cf3a3dc967414af962fa4d

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 30086585ed63e0e1a3cf3a3dc967414af962fa4d

[git]

[-- Attachment #1: Type: text/plain, Size: 5260 bytes --]

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, master has been updated
       via  30086585ed63e0e1a3cf3a3dc967414af962fa4d (commit)
       via  2950a55ca44c453df12b60174396f00b69210423 (commit)
       via  eb7fff99fc287ed76ed39a3d408006bbcf0aabd4 (commit)
       via  2e8b71ca698238b679cc5098fb9f0def8ebf716b (commit)
       via  3b1dbfba60fcfdbe4da096676f8aa32a863e084d (commit)
      from  3ab685b34bd439f77c2f90f4c8214b025eb99e1c (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 30086585ed63e0e1a3cf3a3dc967414af962fa4d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 17 22:38:35 2013 +0100

    core66: add backup.cgi to updater.

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

Summary of changes:
 config/qos/makeqosscripts.pl             |  2 +-
 config/rootfiles/core/66/filelists/files |  1 +
 html/cgi-bin/backup.cgi                  | 10 ++++++++--
 src/install+setup/install/main.c         |  8 +-------
 src/scripts/backupiso                    |  8 ++++++--
 5 files changed, 17 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 8c4f77c..b623cbe 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -58,7 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
-my $fqcodel_options = "noecn limit 800 quantum 500";
+my $fqcodel_options = "limit 800 quantum 500";
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index e139bb0..9d0006f 100644
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -27,6 +27,7 @@ etc/system-release
 opt/pakfire/db/core/mine
 opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
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='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/install+setup/install/main.c b/src/install+setup/install/main.c
index 14139b5..bf0a356 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
 			ctr[TR_CANCEL], NULL);
 	} else {
 	    rc = 1;
-	    fstype = EXT3;
+	    fstype = EXT4;
 	}
 	if (rc == 2)
 		goto EXIT;
@@ -596,12 +596,6 @@ EXIT:
 		fclose(flog);
 		newtFinished();
 
-		if (unattended) {
-			// Remove Setup autorun after boot
-			if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
-				printf("Unable to disable setup autorun.\n");
-		}
-
 		if (system("/bin/umount /harddisk/proc"))
 			printf("Unable to umount /harddisk/proc.\n"); 
 	} else {
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index ffbc54f..30616a4 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -15,8 +15,12 @@ TS=$1
 mkdir -p /var/tmp/backupiso
 cd /var/tmp/backupiso
 
-echo "Fetching ${URL}${ISO}"
-wget --quiet -c ${URL}${ISO}
+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
 


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