[Devil-linux-commit] build/config/etc/init.d network,1.41,1.42

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv331

Modified Files:
	network 
Log Message:
oops


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- network	9 Jan 2010 16:19:08 -0000	1.41
+++ network	28 Jan 2010 01:15:20 -0000	1.42
@@ -44,13 +44,14 @@
 CONFIG_DIR=/etc/sysconfig/nic
 CONFIG_FILE=ifcfg-
 
+DHCP_CLIENT=dhcpcd
+
 dhcp_client_start () {
 	# the interface to do dhcp on
 	local DEVICE=$1
 	# the dhcp client software options
 	local OPTIONS="$2"
 
-	DHCP_CLIENT=dhcpcd
 	
 	DOIT=1
 	if [ -f /var/run/dhcpcd-${DEVICE}.pid ]; then
@@ -78,11 +79,6 @@
 	local SIGNAL=""
 
 	# check which dhcp client software to use
-	dhcp_client_check
-
-	if [ "$DHCP_CLIENT" = "dhcpcd" ]; then
-		[ "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ] && SIGNAL="HUP"
-	fi
 
 	echo -n "Stopping DHCP client daemon on interface $DEVICE"
 	killproc $DHCP_CLIENT $SIGNAL
@@ -123,7 +119,7 @@
 
 	# clear the configuration parameters
 	DHCP=
-	DHCP_OPTIONS="-H -D -S"
+	DHCP_OPTIONS="-q"
 	ONBOOT=
 	DEVICE=
 	VLANID=