--- trunk/magellan-initscripts/etc/rc.d/init.d/network	2009/11/05 12:57:14	931
+++ trunk/magellan-initscripts/etc/rc.d/init.d/network	2009/12/27 02:49:25	955
@@ -103,9 +103,12 @@
 	dhcp)
 		if [[ -z ${DHCP_PROG} ]]
 		then
-			echo "DHCP_PROG missing in net.${interface}, aborted"
-			exit 1
+			echo -n "DHCP_PROG missing in net.${interface},"
+			echo "using default programm"
+			DHCP_PROG="/sbin/dhcpcd"
 		fi
+		[[ -z ${DHCP_START} ]] && DHCP_START="-t 10"
+		[[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k"
 		;;
 
 	esac
@@ -382,7 +385,7 @@
 		checkconfig
 
 		# setup mac
-		if [ -n "${FORCE_MAC_TO}" ]
+		if [[ -n ${FORCE_MAC_TO} ]]
 		then
 			echo -e ${COLOREDSTAR}"Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "
 			ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"
@@ -409,7 +412,7 @@
 				${CURS_UP}
 				${SET_WWCOL}
 				echo "[DHCP]"
-				loadproc ${DHCP_PROG} ${DHCP_START} "${iface}"
+				loadproc "${DHCP_PROG}" "${DHCP_START}" "${iface}"
 				;;
 			static|STATIC)
 				${CURS_UP}