From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 6 Oct 2007 10:10:24 +0000 (+0000)
Subject: Ein weiteres Webradion hinzugefügt
X-Git-Tag: v2.3-beta1~333
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f6504eb327efcb066641c1553ce4c1c29729a870

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 8679a5fb69..f92f6e72a5 100644
--- 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 ff91b1ca33..dbd8b1fe3f 100644
--- 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 8689bf5769..35ca4f3cd9 100644
--- 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 b53e917294..248dc622cb 100644
--- 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;
 	}