[Initng-svn] r1950 - in initng/initfiles: daemon system

[svn at initng.thinktux.net]

Author: jimmy
Date: Sun Nov  6 16:39:57 2005
New Revision: 1950

Added:
   initng/initfiles/system/ntpdate.ii
      - copied, changed from r1949, initng/initfiles/daemon/ntpdate.ii
Removed:
   initng/initfiles/daemon/ntpdate.ii
Modified:
   initng/initfiles/daemon/Makefile.am
   initng/initfiles/daemon/pump.ii
   initng/initfiles/system/Makefile.am
Log:
Som service cleanup.


Modified: initng/initfiles/daemon/Makefile.am
==============================================================================
--- initng/initfiles/daemon/Makefile.am	(original)
+++ initng/initfiles/daemon/Makefile.am	Sun Nov  6 16:39:57 2005
@@ -52,7 +52,6 @@
 	mysql.ii \
 	nifd.ii \
 	nscd.ii \
-	ntpdate.ii \
 	ntpd.ii \
 	rp-pppoe.ii \
 	oidentd.ii \

Modified: initng/initfiles/daemon/pump.ii
==============================================================================
--- initng/initfiles/daemon/pump.ii	(original)
+++ initng/initfiles/daemon/pump.ii	Sun Nov  6 16:39:57 2005
@@ -1,10 +1,13 @@
-service daemon/pump/* {
+daemon daemon/pump/* {
 	#*/
 	need = system/modules system/mountfs
-	daemon = /sbin/pump
+	# daemon = /sbin/pump
 
-	start {
-		source /etc/conf.d/net
+	daemon {
+		if [[ -e /etc/conf.d/net ]]; then
+		    source /etc/conf.d/net
+		fi
+		
 		eval opts=\" \$\{pump_${NAME}\} \"
 		eval d=\" \$\{dhcp_${NAME}\} \"
 		[[ ${d} == "  " ]] && d=" ${dhcp} "
@@ -30,17 +33,7 @@
 		exit 0
 	}
 	
-	stop {
+	kill {
 		/sbin/pump --release -i ${NAME}
-
-		# We need to sleep as pump returns too fast
-		sleep 1
-
-		# pump should not down the interface, but it should drop addresses
-		# it does neither, so we take care of it
-	
-		. /lib/initng/scripts/net/functions
-		interface_del_addresses ${NAME}
-		interface_up ${NAME}
 	}
 }

Modified: initng/initfiles/system/Makefile.am
==============================================================================
--- initng/initfiles/system/Makefile.am	(original)
+++ initng/initfiles/system/Makefile.am	Sun Nov  6 16:39:57 2005
@@ -42,6 +42,7 @@
 	sysctl.ii \
 	urandom.ii \
 	usb.ii \
+	ntpdate.ii \
 	guarddog.ii \
 	wifi-radar.ii \
 	lm-sensors.ii

Copied: initng/initfiles/system/ntpdate.ii (from r1949, initng/initfiles/daemon/ntpdate.ii)
==============================================================================
--- initng/initfiles/daemon/ntpdate.ii	(original)
+++ initng/initfiles/system/ntpdate.ii	Sun Nov  6 16:39:57 2005
@@ -1,4 +1,4 @@
-service daemon/ntpdate {
+service service/ntpdate {
         need = system/initial system/mountroot system/mountfs
 	require_network
         start {