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

[svn at initng.thinktux.net]

Author: jimmy
Date: Sun Nov  6 16:57:05 2005
New Revision: 1951

Added:
   initng/initfiles/system/firestarter.ii
      - copied, changed from r1949, initng/initfiles/daemon/firestarter.ii
Removed:
   initng/initfiles/daemon/firestarter.ii
Modified:
   initng/initfiles/daemon/Makefile.am
   initng/initfiles/daemon/openvpn.ii
   initng/initfiles/daemon/portmap.ii
   initng/initfiles/system/Makefile.am
Log:
Fix services:
portmap probe debian or gentoo options to check.


Modified: initng/initfiles/daemon/Makefile.am
==============================================================================
--- initng/initfiles/daemon/Makefile.am	(original)
+++ initng/initfiles/daemon/Makefile.am	Sun Nov  6 16:57:05 2005
@@ -32,7 +32,6 @@
 	famd.ii \
 	fcron.ii \
 	fetchmail.ii \
-	firestarter.ii \
 	gdm.ii \
 	getty.ii \
 	mingetty.ii \

Modified: initng/initfiles/daemon/openvpn.ii
==============================================================================
--- initng/initfiles/daemon/openvpn.ii	(original)
+++ initng/initfiles/daemon/openvpn.ii	Sun Nov  6 16:57:05 2005
@@ -1,12 +1,13 @@
 
-service daemon/openvpn/* {
+daemon daemon/openvpn/* {
 #*/
 	need = system/initial system/mountroot
 	require_network
 	daemon = /usr/sbin/openvpn
 	daemon_args = --config /etc/openvpn/$NAME/local.conf --writepid /var/run/openvpn-$NAME.pid --cd /etc/openvpn/$NAME
 }
-daemon daemon/openvpn {
+
+service daemon/openvpn {
 	need = system/initial system/mountroot
 	
 start {

Modified: initng/initfiles/daemon/portmap.ii
==============================================================================
--- initng/initfiles/daemon/portmap.ii	(original)
+++ initng/initfiles/daemon/portmap.ii	Sun Nov  6 16:57:05 2005
@@ -1,11 +1,25 @@
-service daemon/portmap {
+daemon daemon/portmap {
 	need = system/mountroot
 	require_network
-	start {
-		[[ -f /etc/conf.d/portmap ]] && . /etc/conf.d/portmap
+	pid_file = /var/run/portmap.pid
+	daemon {
+#ifd gentoo
+		if [[ -f /etc/conf.d/portmap ]]; then
+		    source /etc/conf.d/portmap	
+		fi
 		/sbin/portmap ${PORTMAP_OPTS}
-		# If we don't sleep then applications needing on portmap
-		# will not successfully connect
-		sleep 5 
+#elsed debian
+		if [[ -f /etc/default/portmap ]]; then
+		    source /etc/default/portmap	
+		fi
+		/sbin/pormap ${OPTIONS}
+#elsed
+		/sbin/portmap
+#endd
+
+		# Sleep one second, so that pormap can fork, so we are getting the right pid.
+		sleep 1
+		echo `pidof portmap` > /var/run/portmap.pid
+		exit 0
 	}
 }

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

Copied: initng/initfiles/system/firestarter.ii (from r1949, initng/initfiles/daemon/firestarter.ii)
==============================================================================
--- initng/initfiles/daemon/firestarter.ii	(original)
+++ initng/initfiles/system/firestarter.ii	Sun Nov  6 16:57:05 2005
@@ -4,7 +4,7 @@
 #
 # config: /etc/firestarter/configuration
 
-service daemon/firestarter {
+service service/firestarter {
 	need = system/initial system/mountroot net/lo
 	require_network
 	start = /etc/firestarter/firestarter.sh