#
########################################################################
-
-
. /etc/sysconfig/rc
. ${rc_functions}
+
+#Define some defaults
+RED_VDSL_INET_VLAN=7
+RED_VDSL_IPTV_VLAN=8
+RED_VDSL_IPTV_DISABLE=0
+
+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)
+eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/mac/settings)
+
+MAC=$(tr - : <<<$MAC)
+MAC1=$(tr - : <<<$MAC1)
+MAC2=$(tr - : <<<$MAC2)
TYPE="${RED_TYPE}"
DEVICE="${RED_DEV}"
echo_failure
exit 1
fi
-
-elif [ "${TYPE}" == "DHCP" ]; then
-
- PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
- LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
- DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
- DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
-
fi
+PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
+LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
+DHCP_START=" "
+DHCP_STOP="-k "
+
case "${1}" in
start)
if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
link_status=`ip link show ${DEVICE} 2> /dev/null`
if [ -n "${link_status}" ]; then
if ! echo "${link_status}" | grep -q UP; then
+ if [ -n "$MAC" ]; then
+ boot_mesg "Setting mac address on ${DEVICE} to ${MAC}"
+ ip link set dev ${DEVICE} address ${MAC}
+ evaluate_retval
+ fi
ip link set ${DEVICE} up
fi
fi
evaluate_retval
run_subdir ${rc_base}/init.d/networking/red.up/
-
+
+ # Configure aliases only if red static
+ /usr/local/bin/setaliases
+
elif [ "${TYPE}" == "DHCP" ]; then
- boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
+
+ if [ -e $LEASEINFO ]; then
+ boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
+ . $LEASEINFO
+ if [ "$dhcp_lease_time" = "4294967295" ]; then
+ # do nothing, just echo ok
+ echo ""
+ echo_ok
+ else
+ if [ -n "$DHCP_STOP" ]; then
+ /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
+ RET="$?"
+ if [ "$RET" -eq 0 ]; then
+ echo ""
+ echo_ok
+ elif [ "$RET" -eq 1 ]; then
+ boot_mesg "dhcpcd not running!" ${WARNING}
+ echo_warning
+ else
+ echo ""
+ echo_failure
+ fi
+ else
+ echo ""
+ killproc dhcpcd
+ fi
+ fi
+ fi
+
+ boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
echo -n "${DEVICE}" > /var/ipfire/red/iface
## Create & Enable vnstat
echo_ok
boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
boot_mesg_flush
- boot_mesg " IP Address: $IPADDR"
+ boot_mesg " IP Address: $ip_address"
boot_mesg_flush
if [ -n "${RED_DHCP_HOSTNAME}" ]; then
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
boot_mesg_flush
fi
- boot_mesg " Subnet Mask: $NETMASK"
+ boot_mesg " Subnet Mask: $subnet_mask"
boot_mesg_flush
- boot_mesg " Default Gateway: $GATEWAY"
+ boot_mesg " Default Gateway: $routers"
boot_mesg_flush
- boot_mesg " DNS Server: $DNS"
+ boot_mesg " DNS Server: $domain_name_servers"
boot_mesg_flush
-
- echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
- echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
-
- . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
- echo "$IPADDR" > /var/ipfire/red/local-ipaddress
- grep -v "gateway" /etc/hosts > /tmp/hosts
- echo "$GATEWAY gateway" >> /tmp/hosts
- mv /tmp/hosts /etc/hosts
- echo "$GATEWAY" > /var/ipfire/red/remote-ipaddress
else
echo ""
$(exit "$RET")
PPP_NIC=${DEVICE}
if [ "$TYPE" == "vdsl" ]; then
- boot_mesg "Createing VLAN Interface ${DEVICE}.7 ..."
+ boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
modprobe 8021q
- vconfig add ${DEVICE} 7
- PPP_NIC=${DEVICE}.7
+ vconfig add ${DEVICE} ${RED_VDSL_INET_VLAN}
+ if [ -n "$MAC1" ]; then
+ boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_INET_VLAN} to ${MAC1}"
+ ip link set dev ${DEVICE}.${RED_VDSL_INET_VLAN} address ${MAC1}
+ evaluate_retval
+ fi
+ PPP_NIC=${DEVICE}.${RED_VDSL_INET_VLAN}
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"
+ # Don't startup services ...
+ DHCP_START="-C 70 "
+ DHCP_STOP="-k "
+ # 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 [ "$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
+ fi
+ fi
fi
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
ip addr flush dev $PPP_NIC >/dev/null 2>&1
if [ "$TYPE" == "pptp" ]; then
- ip addr add $PPTP_NICCFG dev $PPP_NIC
+ if [ "$PPTP_NICCFG" == "dhcp" ]; then
+ # Don't startup services ...
+ DHCP_START="-C 70 "
+ DHCP_STOP="-k "
+
+ # 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}.pid > /dev/null
+ fi
+ fi
+
+ if [ ! -f "$PIDFILE" ]; then
+ boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
+ /sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1
+ RET="$?"
+
+ if [ "$RET" = "0" ]; then
+ . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
+ echo ""
+ echo_ok
+ boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
+ 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
+ /sbin/route add $PPTP_PEER gw $routers $PPP_NIC
+ else
+ echo ""
+ $(exit "$RET")
+ evaluate_retval
+ fi
+ fi
+ else
+ ip addr add $PPTP_NICCFG dev $PPP_NIC
+ fi
fi
ip link set ${PPP_NIC} up
else
## 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
;;
fi
run_subdir ${rc_base}/init.d/networking/red.down/
- elif [ "$TYPE" == "DHCP" ]; then
- boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
- if [ -e $LEASEINFO ]; then
- . $LEASEINFO
- if [ "$LEASETIME" = "4294967295" ]; then
- # do nothing, just echo ok
- echo ""
- echo_ok
- else
- if [ -n "$DHCP_STOP" ]; then
- /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
- RET="$?"
- if [ "$RET" -eq 0 ]; then
- echo ""
- echo_ok
- elif [ "$RET" -eq 1 ]; then
- boot_mesg "dhcpcd not running!" ${WARNING}
- echo_warning
- else
- echo ""
- echo_failure
- fi
- else
- echo ""
- killproc dhcpcd
- fi
- fi
- else
- boot_mesg -n "LEASEINFO Test failed! - " ${WARNING}
- boot_mesg "dhcpcd is not running!" ${WARNING}
- echo_warning
- fi
-
elif [ "$TYPE" == "PPPOE" ]; then
boot_mesg "Bringing down the PPP interface ..."
## Disable vnstat collection
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
+ if [ -e $LEASEINFO ]; then
+ boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
+ . $LEASEINFO
+ if [ "$dchp_lease_time" = "4294967295" ]; then
+ # do nothing, just echo ok
+ echo ""
+ echo_ok
+ else
+ if [ -n "$DHCP_STOP" ]; then
+ /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
+ RET="$?"
+ if [ "$RET" -eq 0 ]; then
+ echo ""
+ echo_ok
+ elif [ "$RET" -eq 1 ]; then
+ boot_mesg "dhcpcd not running!" ${WARNING}
+ echo_warning
+ else
+ echo ""
+ echo_failure
+ fi
+ else
+ echo ""
+ killproc dhcpcd
fi
fi
- link_status=`ip link show $DEVICE 2> /dev/null`
+ fi
+
+ if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
+ link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null`
if [ -n "${link_status}" ]; then
if echo "${link_status}" | grep -q UP; then
- boot_mesg "Bringing down the ${DEVICE} interface..."
- ip link set ${DEVICE} down
+ boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..."
+ ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down
+ vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN}
evaluate_retval
fi
+ else
+ link_status=`ip link show $DEVICE 2> /dev/null`
+ if [ -n "${link_status}" ]; then
+ if echo "${link_status}" | grep -q UP; then
+ boot_mesg "Bringing down the ${DEVICE} interface..."
+ ip link set ${DEVICE} down
+ evaluate_retval
+ fi
+ fi
fi
fi
killall -w -s KILL /usr/sbin/pppd >/dev/null 2>&1
projects / people / pmueller / ipfire-2.x.git / blobdiff