Add iptv over adsl to networking/red.

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,7 +264,8 @@ case "${1}" in
 				sleep 0.2
 				ip link set ${PPP_NIC} up
 				TYPE="pppoe"
-				if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
+			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
@@ -262,6 +278,7 @@ case "${1}" in
 
 				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}"	
@@ -296,20 +313,6 @@ case "${1}" in
 					fi
 				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}