removed custom background option for urlfilter option is no longer

supported
reverted cups and squid
change QoS CTRL script
changed exit codes for the red init scripts



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

src/initscripts/init.d/networking/red.down/10-ipsec

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-/usr/local/bin/ipsecctrl D
+/usr/local/bin/ipsecctrl D &
+
+exit 0

src/initscripts/init.d/networking/red.down/10-ovpn

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -k &
+
+exit 0

src/initscripts/init.d/networking/red.up/10-multicast

@@ -5,3 +5,5 @@
 IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
 
 [ "$IFACE" != "" ] && ifconfig $IFACE -multicast
+
+exit 0

src/initscripts/init.d/networking/red.up/30-ddns

@@ -1,3 +1,5 @@
 #!/bin/bash
 
 /usr/local/bin/setddns.pl -f
+
+exit 0

src/initscripts/init.d/networking/red.up/40-ipac

@@ -3,3 +3,4 @@
 /etc/rc.d/helper/writeipac.pl
 /usr/sbin/fetchipac -S
 
+exit 0

src/initscripts/init.d/networking/red.up/50-ipsec

@@ -4,3 +4,4 @@ eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings)
 
 sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
 
+exit 0

src/initscripts/init.d/networking/red.up/50-ovpn

@@ -2,3 +2,4 @@
 
 /usr/local/bin/openvpnctrl -s
 
+exit 0

src/initscripts/init.d/networking/red.up/99-pakfire-update

@@ -1,3 +1,5 @@
 #!/bin/sh
 
 nice -n 10 /opt/pakfire/pakfire update >/dev/null 2>&1 &
+
+exit 0

src/misc-progs/qosctrl.c

@@ -25,9 +25,6 @@ int main(int argc, char *argv[]) {
 		exit(1);
 	}
 	
-	if (strcmp(argv[1], "generate") == 0)
-		safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh");
-	
 	if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) {
 		close(fd);
 	} else {
@@ -44,6 +41,8 @@ int main(int argc, char *argv[]) {
 		safe_system("/var/ipfire/qos/bin/qos.sh status");
 	} else if (strcmp(argv[1], "restart") == 0) {
 		safe_system("/var/ipfire/qos/bin/qos.sh restart");
+	} else if (strcmp(argv[1], "generate") == 0) {
+		safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh");
 	} else {
 		fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
 		exit(1);