--- alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings	2008/06/04 16:52:25	387
+++ alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings	2008/06/04 16:54:35	388
@@ -11,7 +11,7 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.2 2008-06-04 16:52:25 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.3 2008-06-04 16:54:35 niro Exp $
 
 # checks first if the client was already configured and if it has an valid serial
 # if not it runs the autoconfiguration script
@@ -647,47 +647,17 @@
 	case $1 in
 		start)
 			# keeping like always safe:
-			# no network should be startet here,
-			# so we can delete all pid files if one exists
-			if ps -A|grep dhcpcd > /dev/null
-			then
-				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
-				dhcpcd -k
-				sleep 1
-			else
-				rm -f /var/run/dhcpcd-eth?.pid
-			fi
-			[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
-				${rc_base}/init.d/network stop
+			# no network should be started here
+			${rc_base}/init.d/network stop
 
 			echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
-
 			# start network configured from /etc/conf.d
-			if [[ ${ALX_CONFD_NETWORKING} = true ]]
-			then
-				${rc_base}/init.d/network start
-			else
-				echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}
-				# -t 10 timeout of 10 secs
-				dhcpcd -t 10 &> /dev/null
-				evaluate_retval
-			fi
+			${rc_base}/init.d/network start
 			;;
 
 		stop)
 			echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}
-			if [[ ${ALX_CONFD_NETWORKING} = true ]]
-			then
-				${rc_base}/init.d/network stop
-			else
-				echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
-				ifconfig eth0 down
-			fi
-			if ps -A|grep dhcpcd > /dev/null
-			then
-				dhcpcd -z  &> /dev/null
-			fi
-			evaluate_retval
+			${rc_base}/init.d/network stop
 			;;
 
 		*)