X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fnetworking%2Fred;h=ac6cec04033cd39ee8ef870dbabb75feaad81ee6;hp=b694a3c04e8f62c149d32bb9c4e87eb2b447081c;hb=7f8e589bf06deee51e70a9b7d287ebaba1a239b3;hpb=d1c2593a7de89f63432a6fe175c6c1b36e8824d2 diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index b694a3c04e..ac6cec0403 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -33,6 +33,7 @@ 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}" @@ -79,8 +80,8 @@ fi 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 " +DHCP_START=" " +DHCP_STOP="-k " case "${1}" in start) @@ -141,7 +142,7 @@ case "${1}" in if [ -e $LEASEINFO ]; then boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." . $LEASEINFO - if [ "$LEASETIME" = "4294967295" ]; then + if [ "$dhcp_lease_time" = "4294967295" ]; then # do nothing, just echo ok echo "" echo_ok @@ -166,7 +167,7 @@ case "${1}" in fi fi - boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..." + boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..." echo -n "${DEVICE}" > /var/ipfire/red/iface ## Create & Enable vnstat @@ -200,35 +201,18 @@ case "${1}" in 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 - if [ -n "$DNS0" ] && [ -n "$DNS1" ]; then - boot_mesg "Overwritting DNS-Server addresses with ${DNS0},${DNS1}" - echo -n ${DNS0} > /var/ipfire/red/dns1 - echo -n ${DNS1} > /var/ipfire/red/dns2 - evaluate_retval - else - 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 - fi - - . /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 - touch /var/ipfire/red/active else echo "" $(exit "$RET") @@ -253,6 +237,11 @@ case "${1}" in boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..." modprobe 8021q 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 @@ -260,7 +249,8 @@ case "${1}" in 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" - DHCP_START="-N -R -L /var/ipfire/dhcpc " + # 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 @@ -288,15 +278,15 @@ case "${1}" in echo_ok boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:" boot_mesg_flush - boot_mesg " IP Address: $IPADDR" + boot_mesg " IP Address: $ip_address" boot_mesg_flush boot_mesg " Hostname: $RED_DHCP_HOSTNAME" boot_mesg_flush - 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 else @@ -330,7 +320,8 @@ case "${1}" in ip addr flush dev $PPP_NIC >/dev/null 2>&1 if [ "$TYPE" == "pptp" ]; then if [ "$PPTP_NICCFG" == "dhcp" ]; then - DHCP_START="-N -R -L /var/ipfire/dhcpc " + # Don't startup services ... + DHCP_START="-C 70 " DHCP_STOP="-k " # Test to see if there is a stale pid file @@ -352,17 +343,17 @@ case "${1}" in 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 boot_mesg " Hostname: $RED_DHCP_HOSTNAME" boot_mesg_flush - 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 - /sbin/route add $PPTP_PEER gw $GATEWAY $PPP_NIC + /sbin/route add $PPTP_PEER gw $routers $PPP_NIC else echo "" $(exit "$RET") @@ -537,7 +528,7 @@ case "${1}" in if [ -e $LEASEINFO ]; then boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." . $LEASEINFO - if [ "$LEASETIME" = "4294967295" ]; then + if [ "$dchp_lease_time" = "4294967295" ]; then # do nothing, just echo ok echo "" echo_ok @@ -568,7 +559,7 @@ case "${1}" in if echo "${link_status}" | grep -q UP; then boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..." ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down - vconfig del ${DEVICE} ${RED_VDSL_INET_VLAN} + vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN} evaluate_retval fi else