From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 5 Jan 2010 14:25:18 +0000 (+0100)
Subject: More DHCP Fixes.
X-Git-Tag: v2.9-beta1~537
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5ba06eb81c3317ac64fec5b877107e3903de33cb

More DHCP Fixes.
---

diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index d0e6599c35..d69f53d0b4 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -14,6 +14,8 @@
 . /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()
@@ -21,8 +23,8 @@ dhcpcd_up()
 	set | grep "^new_" | sed "s|^new_||g" | \
 	sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
 
-	# If interface is not red0.8 (vdsl-iptv) update /var/ipfire/red
-	if [ "$interface" != "red0.8" ]; then
+	# 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;
@@ -68,7 +70,9 @@ dhcpcd_down()
 {
 	set | grep "^new_" | sed "s|^new_||g" | \
 	sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
-	if [ "$interface" != "red0.8" ]; then
+
+	# 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
 		run_subdir ${rc_base}/init.d/networking/red.down/
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index ac6cec0403..f60c0d1591 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -249,9 +249,6 @@ 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"
-					# 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
@@ -320,10 +317,6 @@ case "${1}" in
 				ip addr flush dev $PPP_NIC >/dev/null 2>&1
 				if [ "$TYPE" == "pptp" ]; then
 					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