Remove newline from ip-address files if red=dhcp.

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

diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index dca1b8339965e8f0d216cb5b3e6b7ebe782f8450..0d06bcb1569561fdcec2f84bbefe1a50264f59c4 100644 (file)
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -1,31 +1,85 @@
-#!/bin/sh
 ########################################################################
 # Begin
 #
 # Description : DHCP Client Script
 #
-# Authors     : Michael Tremer - mitch@ipfire.org
+# Authors     : Arne Fitzenreiter - arne_f@ipfire.org
 #
-# Version     : 01.00
+# Version     : 02.00
 #
 # Notes       : 
 #
 ########################################################################
 
-eval $(/usr/local/bin/readhash "$1")
-case "$2" in
-       up)
-               logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}"
-               touch /var/ipfire/red/active
-               ;;
-       new)    
-               logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
+. /etc/sysconfig/rc
+. $rc_functions
+
+
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
+
+dhcpcd_up()
+{
+       set | grep "^new_" | sed "s|^new_||g" | \
+       sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
+
+       # Only if RED_TYPE=DHCP update /var/ipfire/red
+       if [ "$RED_TYPE" == "DHCP" ]; then
+
+               #Check if we have to restart the services at update
+               [ ! -e "/var/ipfire/red/active" ] update=1;
+               if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
+                       update=1;
+               fi
+               if [ "$old_ip_address" != "$new_ip_address" ]; then
+                       update=1;
+               fi
+               if [ "$old_routers" != "$new_routers" ]; then
+                       update=1;
+               fi
+
+               #Get DNS from dhcp
+               if [ -n "$DNS0" ] && [ -n "$DNS1" ]; then
+                       logger -p local0.info -t dhcpcd.exe[$$] "Overwritting DNS-Server addresses with ${DNS0},${DNS1}"        
+                       echo -n ${DNS0} > /var/ipfire/red/dns1
+                       echo -n ${DNS1} > /var/ipfire/red/dns2
+               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
+
+               #Get IP Address
+               echo -n "$new_ip_address"  > /var/ipfire/red/local-ipaddress
+
+               #Get default gateway
+               grep -v " gateway$" /etc/hosts > /tmp/hosts
+               echo "$new_routers gateway"  >> /tmp/hosts
+               mv /tmp/hosts /etc/hosts
+
+       fi
+       if [ $update ]; then
                [ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
-               ;;
-       down)
-               logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been brought down"
+               echo -n "$new_routers" > /var/ipfire/red/remote-ipaddress
+               logger -p local0.info -t dhcpcd.exe[$$] "$interface has been (re)configured with IP=$new_ip_address"
+               run_subdir ${rc_base}/init.d/networking/red.up/
+               touch /var/ipfire/red/active
+       fi
+}
+
+dhcpcd_down()
+{
+       set | grep "^new_" | sed "s|^new_||g" | \
+       sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
+
+       # Only if RED_TYPE=DHCP update /var/ipfire/red
+       if [ "$RED_TYPE" == "DHCP" ]; then
+               logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
                rm -f /var/ipfire/red/active
-               ;;
-esac
+               run_subdir ${rc_base}/init.d/networking/red.down/
+       fi
+}
 
-# End
+case "$reason" in
+BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)       dhcpcd_up;;
+PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) dhcpcd_down;;
+esac