Ein weiteres Webradion hinzugefügt

Backup include angepasst
Pakfire timeout auf 20 gesetzt
Fix im Networking Skript für any

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@949 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/include b/config/backup/include
index 8679a5fb69aaec98622bc806bed131d3585088f3..f92f6e72a5630a9433a7dbb0d3293405baa8ad8e 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -23,4 +23,6 @@
 /var/ipfire/vpn
 /var/log/ip-acct/*
 /var/log/rrd/*
+/etc/sysconfig/firewall.local
+/etc/sysconfig/rc.local
 

diff --git a/config/mpfire/webradio b/config/mpfire/webradio
index ff91b1ca336a71dac526527483890579b5ef12a7..dbd8b1fe3fb13412419642fb6e428b5efe050d41 100644 (file)
--- a/config/mpfire/webradio
+++ b/config/mpfire/webradio
@@ -7,3 +7,4 @@ gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://ww
 dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm
 87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de
 rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/
+relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com

diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/init.d/networking/any
index 8689bf57691ef91f558272e3ebc403bba7a130c7..35ca4f3cd98ffddfe6412321860756f8cea2c460 100644 (file)
--- a/src/initscripts/init.d/networking/any
+++ b/src/initscripts/init.d/networking/any
@@ -83,7 +83,7 @@ case "${1}" in
                ;;
 
        stop)
-               boot_mesg "Removing IPv4 address ${ADDRESS} from the ${1} interface..."
+               boot_mesg "Removing IPv4 address ${ADDRESS} from the ${2} interface..."
                ip addr del ${args} dev ${DEVICE}
                evaluate_retval
                ;;

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index b53e917294f9d2083aac266d471da25682866d30..248dc622cb05169a609e79e3883dd861a9e928e9 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -281,11 +281,11 @@ sub selectmirror {
        ### Check if there is a current server list and read it.
        #   If there is no list try to get one.
        my $count = 0;
-       while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 5)) {
+       while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 20)) {
                $count++;
                getmirrors("noforce");
        }
-       if ($count == 5) {
+       if ($count == 20) {
                message("MIRROR ERROR: Could not find or download a server list");
                exit 1;
        }