From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Thu, 2 Sep 2010 18:05:11 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~113
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=cdb4dc96305083c0d16977fb6e1db1d665bb6196;hp=d9716b067d5ad6c904653840c70d9fde01eac3f7

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 87f4318d5f..0a99dc97a9 100644
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -1,4 +1,3 @@
-etc/init.d
 #etc/rc.d
 #etc/rc.d/helper
 etc/rc.d/helper/getdnsfromdhcpc.pl
@@ -40,15 +39,19 @@ etc/rc.d/init.d/ipsec
 #etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/localnet
+etc/rc.d/init.d/mISDN
+#etc/rc.d/init.d/mdadm
 #etc/rc.d/init.d/mediatomb
 #etc/rc.d/init.d/messagebus
+#etc/rc.d/init.d/miau
 #etc/rc.d/init.d/mldonkey
-etc/rc.d/init.d/mISDN
 etc/rc.d/init.d/modules
+#etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mpd
 #etc/rc.d/init.d/mysql
+#etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any
@@ -79,10 +82,10 @@ etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
-#etc/rc.d/init.d/openvmtools
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
 #etc/rc.d/init.d/nut
+#etc/rc.d/init.d/openvmtools
 #etc/rc.d/init.d/portmap
 #etc/rc.d/init.d/postfix
 #etc/rc.d/init.d/pound
@@ -105,26 +108,33 @@ etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/teamspeak
 etc/rc.d/init.d/template
 #etc/rc.d/init.d/tftpd
+etc/rc.d/init.d/tmpfs
 etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdr
+#etc/rc.d/init.d/vdradmin
 #etc/rc.d/init.d/vsftpd
 #etc/rc.d/init.d/watchdog
 #etc/rc.d/init.d/winbind
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
+#etc/rc.d/rc0.d/K01imspetor
+#etc/rc.d/rc0.d/K01motion
+#etc/rc.d/rc0.d/K01vdradmin
 #etc/rc.d/rc0.d/K02mediatomb
 #etc/rc.d/rc0.d/K02sslh
 etc/rc.d/rc0.d/K08fcron
 etc/rc.d/rc0.d/K28apache
 etc/rc.d/rc0.d/K30sshd
 etc/rc.d/rc0.d/K45random
+etc/rc.d/rc0.d/K49cyrus-sasl
 etc/rc.d/rc0.d/K78snort
 etc/rc.d/rc0.d/K79leds
 etc/rc.d/rc0.d/K80network
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K85tmpfs
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/K99beep
 etc/rc.d/rc0.d/S60sendsignals
@@ -133,6 +143,7 @@ etc/rc.d/rc0.d/S80mountfs
 etc/rc.d/rc0.d/S90swap
 etc/rc.d/rc0.d/S99halt
 #etc/rc.d/rc3.d
+etc/rc.d/rc3.d/S01tmpfs
 etc/rc.d/rc3.d/S10sysklogd
 #etc/rc.d/rc3.d/S15messagebus
 #etc/rc.d/rc3.d/S16bluetooth
@@ -140,6 +151,7 @@ etc/rc.d/rc3.d/S10sysklogd
 etc/rc.d/rc3.d/S19smartenabler
 etc/rc.d/rc3.d/S20network
 etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S24cyrus-sasl
 etc/rc.d/rc3.d/S25random
 etc/rc.d/rc3.d/S30sshd
 etc/rc.d/rc3.d/S32apache
@@ -148,18 +160,26 @@ etc/rc.d/rc3.d/S40fcron
 etc/rc.d/rc3.d/S98rc.local
 #etc/rc.d/rc3.d/S98sslh
 etc/rc.d/rc3.d/S99beep
+#etc/rc.d/rc3.d/S99imspetor
+#etc/rc.d/rc3.d/S99motion
+#etc/rc.d/rc3.d/S99vdradmin
 #etc/rc.d/rc6.d
+#etc/rc.d/rc6.d/K01imspetor
+#etc/rc.d/rc6.d/K01motion
+#etc/rc.d/rc6.d/K01vdradmin
 #etc/rc.d/rc6.d/K02mediatomb
 #etc/rc.d/rc6.d/K02sslh
 etc/rc.d/rc6.d/K08fcron
 etc/rc.d/rc6.d/K28apache
 etc/rc.d/rc6.d/K30sshd
 etc/rc.d/rc6.d/K45random
+etc/rc.d/rc6.d/K49cyrus-sasl
 etc/rc.d/rc6.d/K78snort
 etc/rc.d/rc6.d/K79leds
 etc/rc.d/rc6.d/K80network
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K85tmpfs
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/K99beep
 etc/rc.d/rc6.d/S60sendsignals
@@ -187,24 +207,4 @@ etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc
 etc/sysconfig/rc.local
-etc/rc.d/init.d/tmpfs
-etc/rc.d/rc0.d/K85tmpfs
-etc/rc.d/rc3.d/S01tmpfs
-etc/rc.d/rc6.d/K85tmpfs
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/rc0.d/K01vdradmin
-#etc/rc.d/rc3.d/S99vdradmin
-#etc/rc.d/rc6.d/K01vdradmin
-#etc/rc.d/init.d/motion
-#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/init.d/miau
-#etc/rc.d/rc0.d/K01miau
-#etc/rc.d/rc3.d/S99miau
-#etc/rc.d/rc6.d/K01miau
-#etc/rc.d/init.d/netsnmpd
-#etc/rc.d/init.d/mdadm
-etc/rc.d/rc0.d/K49cyrus-sasl
-etc/rc.d/rc3.d/S24cyrus-sasl
-etc/rc.d/rc6.d/K49cyrus-sasl
+etc/init.d
diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files
index 7375f0fc02..04075e692e 100644
--- a/config/rootfiles/core/40/filelists/files
+++ b/config/rootfiles/core/40/filelists/files
@@ -8,9 +8,11 @@ var/ipfire/dhcp/dhcpd.conf.local
 etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/time.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
 usr/lib/python2.7/ipaddr.pyc
 usr/lib/python2.7/site-packages/drv_libxml2.py
diff --git a/config/rootfiles/packages/imspector b/config/rootfiles/packages/imspector
index 0cd6ee8bc5..945c3774df 100644
--- a/config/rootfiles/packages/imspector
+++ b/config/rootfiles/packages/imspector
@@ -1,4 +1,5 @@
 etc/imspector
+etc/imspector.conf
 #etc/imspector/acl.txt
 #etc/imspector/badwords.txt
 #etc/imspector/imspector.conf
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index a39d4f722c..fc28e70bba 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -727,7 +727,7 @@ END
 ;
 }
 
-        if ($pppsettings{'TYPE'} eq 'vdsl') {
+        if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
 print <<END
 <tr>
         <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index a574050d74..1940169f4e 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -236,6 +236,21 @@ case "${1}" in
 
 			PPP_NIC=${DEVICE}
 
+
+			if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
+				PPP_NIC=nas0		
+				DEVICE=nas0
+				boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
+				br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
+				sleep 1
+				if [ "$TYPE" == "pppoeatm" ]; then
+					TYPE="pppoe"
+				fi
+				if [ "$TYPE" == "pptpatm" ]; then
+					TYPE="pptp"
+				fi
+			fi
+
 			if [ "$TYPE" == "vdsl" ]; then
 				boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
 				modprobe 8021q
@@ -249,67 +264,55 @@ case "${1}" in
 				sleep 0.2
 				ip link set ${PPP_NIC} up
 				TYPE="pppoe"
-				if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
-					PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
-					LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
-					# Test to see if there is a stale pid file
-					if [ -f "$PIDFILE" ]; then
-						ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
-						if [ $? != 0 ]; then
-							rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
-						fi
+			fi
+			if [ "${IPTV}" == "enable" ]; then
+				PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
+				LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
+				# Test to see if there is a stale pid file
+				if [ -f "$PIDFILE" ]; then
+					ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
+					if [ $? != 0 ]; then
+						rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
 					fi
+				fi
 
-					if [ ! -f "$PIDFILE" ]; then
-						boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
-						vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
-						if [ -n "$MAC2" ]; then
-							boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"	
-							ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
-							evaluate_retval
-						fi
-						boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
-						/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
-						RET="$?"
+				if [ ! -f "$PIDFILE" ]; then
+					boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
+					modprobe 8021q
+					vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
+					if [ -n "$MAC2" ]; then
+						boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"	
+						ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
+						evaluate_retval
+					fi
+					boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
+					/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
+					RET="$?"
 
-						if [ "$RET" = "0" ]; then
-							. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
-							echo ""
-							echo_ok
-							boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
-							boot_mesg_flush
-							boot_mesg "           IP Address:      $ip_address"
-							boot_mesg_flush
-							boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
-							boot_mesg_flush
-							boot_mesg "           Subnet Mask:     $subnet_mask"
-							boot_mesg_flush
-							boot_mesg "           Default Gateway: $routers"
-							boot_mesg_flush
-							boot_mesg "           DNS Server:      $domain_name_servers"
-							boot_mesg_flush
+					if [ "$RET" = "0" ]; then
+						. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
+						echo ""
+						echo_ok
+						boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
+						boot_mesg_flush
+						boot_mesg "           IP Address:      $ip_address"
+						boot_mesg_flush
+						boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
+						boot_mesg_flush
+						boot_mesg "           Subnet Mask:     $subnet_mask"
+						boot_mesg_flush
+						boot_mesg "           Default Gateway: $routers"
+						boot_mesg_flush
+						boot_mesg "           DNS Server:      $domain_name_servers"
+						boot_mesg_flush
 
-						else
-							echo ""
-							$(exit "$RET")
-							evaluate_retval
-						fi
+					else
+						echo ""
+						$(exit "$RET")
+						evaluate_retval
 					fi
 				fi
 			fi
-
-			if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
-				PPP_NIC=nas0		
-				boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
-				br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
-				sleep 1
-				if [ "$TYPE" == "pppoeatm" ]; then
-					TYPE="pppoe"
-				fi
-				if [ "$TYPE" == "pptpatm" ]; then
-					TYPE="pptp"
-				fi
-			fi
 			if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then
 				if [ "$PPP_NIC" == "" ]; then
 					boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}