[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae - IPFire-SCM

30 Aug 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae (commit)
       via  4247f58a1295e4f8748eea61baf5f9aa03872806 (commit)
       via  f55a1ae2170b2eaced6e797f8c7e66d0bd9831ca (commit)
       via  d0c3a0c57691e3074cd95f91983cd81086d12bd6 (commit)
       via  090eda1dc856043a212923f8ac4bff5269249780 (commit)
      from  b6af41a572eb83e73875b1f8d450405fbee8eb0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae
Merge: b6af41a 4247f58
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Mon Aug 30 21:40:55 2010 +0200
Merge branch 'master' into next
Conflicts:
    	config/rootfiles/core/40/filelists/files
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/initscripts   |   48 +++++++-------
 config/rootfiles/packages/imspector   |    1 +
 html/cgi-bin/pppsetup.cgi             |    2 +-
 src/initscripts/init.d/networking/red |  111 +++++++++++++++++----------------
 4 files changed, 83 insertions(+), 79 deletions(-)
Difference in files:

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 5fd0c17..3aa0d22 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
@@ -41,15 +40,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
@@ -80,10 +83,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
@@ -106,26 +109,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
@@ -134,6 +144,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
@@ -141,6 +152,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
@@ -149,18 +161,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
@@ -189,24 +209,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/packages/imspector b/config/rootfiles/packages/imspector
index 0cd6ee8..945c377 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 a39d4f7..fc28e70 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 a574050..1940169 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}
hooks/post-receive
--
IPFire 2.x development tree

    