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

[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-serv12638/config/etc/init.d

Modified Files:
	network 
Log Message:
- dhcp client is now hardcoded to dhcpcd
- dhcp client options are now in interface config file ifcfg-* as
  DHCP_OPTIONS=
- removed the directory /etc/sysconfig/network/


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- network	9 Jan 2010 15:54:09 -0000	1.40
+++ network	9 Jan 2010 16:19:08 -0000	1.41
@@ -38,47 +38,19 @@
 
 # new config files
 [ -s /etc/sysconfig/network/config ] && . /etc/sysconfig/network/config
-[ -s /etc/sysconfig/network/dhcp ] && . /etc/sysconfig/network/dhcp
 
 VLAN=/bin/vconfig
 
 CONFIG_DIR=/etc/sysconfig/nic
 CONFIG_FILE=ifcfg-
 
-dhcp_client_check () {
-	# the dhcp client software to use
-	DHCP_CLIENT=dhcpcd
-	[ -n "$DHCLIENT_BIN" ] && DHCP_CLIENT="$DHCLIENT_BIN"
-}
-
 dhcp_client_start () {
 	# the interface to do dhcp on
 	local DEVICE=$1
 	# the dhcp client software options
-	local OPTIONS=""
-
-	# check which dhcp client software to use
-	dhcp_client_check
-
-	if [ "$DHCP_CLIENT" = "dhcpcd" ]; then
-		[ "$DHCLIENT_DEBUG" = "yes" ] && OPTIONS="$OPTIONS -d"
-		[ "$DHCLIENT_SET_HOSTNAME" = "yes" ] && OPTIONS="$OPTIONS -H"
-		[ "$DHCLIENT_MODIFY_RESOLV_CONF" != "yes" ] && OPTIONS="$OPTIONS -R"
-		[ "$DHCLIENT_SET_DEFAULT_ROUTE" != "yes" ] && OPTIONS="$OPTIONS -G"
-		[ "$DHCLIENT_MODIFY_NTP_CONF" != "yes" ] && OPTIONS="$OPTIONS -N"
-		[ "$DHCLIENT_MODIFY_NIS_CONF" != "yes" ] && OPTIONS="$OPTIONS -Y"
-		[ "$DHCLIENT_SET_DOMAINNAME" = "yes" ] && OPTIONS="$OPTIONS -D"
-		[ "$DHCLIENT_KEEP_SEARCHLIST" = "yes" ] && OPTIONS="$OPTIONS -S"
-		OPTIONS="$OPTIONS ${DHCLIENT_LEASE_TIME:+-l $DHCLIENT_LEASE_TIME}"
-		OPTIONS="$OPTIONS ${DHCLIENT_TIMEOUT:+-t $DHCLIENT_TIMEOUT}"
-		OPTIONS="$OPTIONS ${DHCLIENT_REBOOT_TIMEOUT:+-z $DHCLIENT_REBOOT_TIMEOUT}"
-		OPTIONS="$OPTIONS ${DHCLIENT_HOSTNAME_OPTION:+-h $DHCLIENT_HOSTNAME_OPTION}"
-		OPTIONS="$OPTIONS ${DHCLIENT_CLIENT_ID:+-I $DHCLIENT_CLIENT_ID}"
-		OPTIONS="$OPTIONS ${DHCLIENT_VENDOR_CLASS_ID:+-i $DHCLIENT_VENDOR_CLASS_ID}"
-		OPTIONS="$OPTIONS ${DHCLIENT_SCRIPT_EXE:+-c $DHCLIENT_SCRIPT_EXE}"
-		OPTIONS="$OPTIONS $DHCLIENT_ADDITIONAL_OPTIONS"
+	local OPTIONS="$2"
 
-	fi
+	DHCP_CLIENT=dhcpcd
 	
 	DOIT=1
 	if [ -f /var/run/dhcpcd-${DEVICE}.pid ]; then
@@ -151,6 +123,7 @@
 
 	# clear the configuration parameters
 	DHCP=
+	DHCP_OPTIONS="-H -D -S"
 	ONBOOT=
 	DEVICE=
 	VLANID=
@@ -237,7 +210,7 @@
 			# FIXME: only needed for dhcp server not client, right?
 			#$VLAN set_flag $PHYDEV REORDER_HDR 1
 
-			dhcp_client_start $DEVICE
+			dhcp_client_start $DEVICE "$DHCP_OPTIONS"
 		else
 			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST"
 			NMASK=""; test -n "$NETMASK" && NMASK="/$NETMASK"