[Initng-svn] r2941 - in initng: initfiles/daemon initfiles/system plugins/ngcs plugins/respawn

[svn at initng.thinktux.net]

Author: makomk
Date: Sat Feb  4 16:46:16 2006
New Revision: 2941

Modified:
   initng/initfiles/daemon/Makefile.am
   initng/initfiles/system/udev.ii
   initng/plugins/ngcs/ngcs.py
   initng/plugins/respawn/initng_respawn.c
Log:
Misc. fixes


Modified: initng/initfiles/daemon/Makefile.am
==============================================================================
--- initng/initfiles/daemon/Makefile.am	(original)
+++ initng/initfiles/daemon/Makefile.am	Sat Feb  4 16:46:16 2006
@@ -113,6 +113,7 @@
 	xinetd.ii \
 	dovecot.ii \
 	vdradmind.ii \
-	vdr.ii
+	vdr.ii \
+	mldonkey.ii
 
 EXTRA_DIST = $(iifiles)

Modified: initng/initfiles/system/udev.ii
==============================================================================
--- initng/initfiles/system/udev.ii	(original)
+++ initng/initfiles/system/udev.ii	Sat Feb  4 16:46:16 2006
@@ -10,6 +10,7 @@
 	respawn;
 #ifd gentoo
 	pid_of = udevd;
+	forks;
 	script daemon = {
 	    killall udevd # needed, or "emerge udev" screws things up
 	    exec @/sbin/udevd@ --daemon;

Modified: initng/plugins/ngcs/ngcs.py
==============================================================================
--- initng/plugins/ngcs/ngcs.py	(original)
+++ initng/plugins/ngcs/ngcs.py	Sat Feb  4 16:46:16 2006
@@ -39,7 +39,7 @@
 def _flatten(data):
     newdata = [ ]
     for i in data:
-        if isinstance(data,(TupleType,ListType)):
+        if isinstance(i,(TupleType,ListType)):
             t = _flatten(i)
             newdata.append(NgcsData(NGCS_TYPE_GROUP,struct.pack("@i",len(t))))
             newdata.extend(t)

Modified: initng/plugins/respawn/initng_respawn.c
==============================================================================
--- initng/plugins/respawn/initng_respawn.c	(original)
+++ initng/plugins/respawn/initng_respawn.c	Sat Feb  4 16:46:16 2006
@@ -66,9 +66,13 @@
 
     assert(service);
 
+    D_("Calling check_respawn for service %s state %s -> %s\n", service->name,
+       service->current_state->state_name, status->state_name);
+
     /* look for when initng are trying to set a servuce to STOPPED */
-    if (status != &STOPPED || status != &DAEMON_EXIT_BAD)
-        return (TRUE);
+    /* if (status != &STOPPED || status != &DAEMON_EXIT_BAD)
+        return (TRUE); */
+    if(status->is != IS_DOWN) return (TRUE);
 
     /* check that current status is RUNNING, so it realy died, and not is manually stopped */
     if (!IS_MARK(service, &RUNNING))