[Initng-svn] r1948 - initng/initfiles/daemon

[svn at initng.thinktux.net]

Author: jimmy
Date: Sun Nov  6 16:13:45 2005
New Revision: 1948

Modified:
   initng/initfiles/daemon/dhcpcd.ii
Log:
Fix dhcpcd daemon.


Modified: initng/initfiles/daemon/dhcpcd.ii
==============================================================================
--- initng/initfiles/daemon/dhcpcd.ii	(original)
+++ initng/initfiles/daemon/dhcpcd.ii	Sun Nov  6 16:13:45 2005
@@ -1,11 +1,10 @@
-service daemon/dhcpcd/* {
+daemon daemon/dhcpcd/* {
 	need = system/initial system/mountfs system/modules system/hostname
 	use = system/static-modules system/coldplug
-	#daemon = /sbin/dhcpcd
 	pid_file = /var/run/dhcpcd-$NAME.pid
 	respawn
 	
-	start {
+	daemon {
 		if [[ -e /etc/conf.d/net ]]; then
 		    source /etc/conf.d/net
 		fi
@@ -31,22 +30,7 @@
 			&& ${opts} != *' -h '* && ${d} != *' nohostname '* ]] \
 				&& opts="${opts} -h ${h}"
 	
-		/sbin/dhcpcd ${opts} ${NAME}
+		exec /sbin/dhcpcd ${opts} ${NAME}
 	}
 
-	stop {
-		if [[ -e /etc/conf.d/net ]]; then
-		    source /etc/conf.d/net
-		fi
-
-		eval d=\" \$\{dhcp_${NAME}\} \"
-		[[ -z ${d} ]] && d="${dhcp}"
-		if [[ ${d} == *' norelease '* ]]; then
-			signal="TERM"
-		else
-			signal="HUP"
-		fi
-		
-		kill -s ${signal} $( < /var/run/dhcpcd-${NAME}.pid )
-	}
 }