Remove error message if no ppp0.rrd exist yet.

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / networking / red

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index caa857263ddc9c3e844d7d1ca502456bcfc83d08..57393842284773133cda5a7f5a949088b4f3eb00 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -15,8 +15,16 @@
 #
 ########################################################################
 
+
+
 . /etc/sysconfig/rc 
 . ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
+if [ "$RRDLOG" == "" ]; then
+       RRDLOG=/var/log/rrd
+fi
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 TYPE="${RED_TYPE}"
@@ -191,7 +199,17 @@ case "${1}" in
                        [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
                        
                        PPP_NIC=${DEVICE}
-                       
+
+                       if [ "$TYPE" == "vdsl" ]; then
+                               boot_mesg "Createing VLAN Interface ${DEVICE}.7 ..."
+                               modprobe 8021q
+                               vconfig add ${DEVICE} 7
+                               PPP_NIC=${DEVICE}.7
+                               sleep 0.2
+                               ip link set ${PPP_NIC} up
+                               TYPE="pppoe"
+                       fi
+
                        if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
                                PPP_NIC=nas0            
                                boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
@@ -295,8 +313,10 @@ case "${1}" in
                        
                        if [ "$TYPE" == "modem" ]; then
                                PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts"
+                               METHOD="PPPOE_PLUGIN"
                        elif [ "$TYPE" == "serial" ]; then
                                PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /bin/true lock modem crtscts"
+                               METHOD="PPPOE_PLUGIN"
                        fi
                
                        ### Standard PPP options we always use
@@ -326,11 +346,12 @@ case "${1}" in
                        #
                        if [ "$TYPE" == "pptp" ]; then
                                PPPOE_CMD="pptp $PPTP_PEER --nolaunchpppd"
+                               METHOD=""
                        fi
                        
                        ### Run everything
                        #
-                       if [ "${METHOD}" == "PPPOE_PLUGIN" ]; then
+                       if [ "$METHOD" == "PPPOE_PLUGIN" ]; then
                                /usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND >/dev/null 2>&1 &
                                evaluate_retval
                                # echo PLUGIN: /usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND
@@ -342,7 +363,10 @@ case "${1}" in
                        ## Create & Enable vnstat
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
-
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+                               $(date +%s):: > /dev/null 2>&1
+                       exit 0
                fi
                ;;
 
@@ -398,9 +422,21 @@ case "${1}" in
                        rm -f /var/ipfire/red/keepconnected
                        killall -w -s TERM /usr/sbin/pppd 2>/dev/null
                        evaluate_retval
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+                               $(date +%s):: > /dev/null 2>&1
                fi
 
                if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
+                       link_status=`ip link show $DEVICE.7 2> /dev/null`
+                       if [ -n "${link_status}" ]; then
+                               if echo "${link_status}" | grep -q UP; then
+                                       boot_mesg "Bringing down the ${DEVICE}.7 interface..."
+                                       ip link set ${DEVICE}.7 down
+                                       vconfig del ${DEVICE} 7
+                                       evaluate_retval
+                               fi
+                       fi
                        link_status=`ip link show $DEVICE 2> /dev/null`
                        if [ -n "${link_status}" ]; then
                                if echo "${link_status}" | grep -q UP; then