Update dhcpcd.

[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 21952f475cde4f490fc2101f3b0f5c191fbc5b26..cadac7c49003aa1ed50630f8ee26a1048aebeb43 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -80,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)
@@ -142,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
@@ -167,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
@@ -201,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")
@@ -266,7 +249,7 @@ 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 "
+                                       DHCP_START=" "
                                        DHCP_STOP="-k "
                                        # Test to see if there is a stale pid file
                                        if [ -f "$PIDFILE" ]; then
@@ -294,15 +277,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
@@ -543,7 +526,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