[Initng-svn] r2738 - in initng: initfiles/daemon initfiles/system plugins/simple_launcher

[svn at initng.thinktux.net]

Author: jimmy
Date: Fri Jan  6 18:46:54 2006
New Revision: 2738

Modified:
   initng/initfiles/daemon/fetchmail.ii
   initng/initfiles/daemon/gdm.ii
   initng/initfiles/daemon/ifplugd.ii
   initng/initfiles/system/anacron.ii
   initng/plugins/simple_launcher/initng_simple_launcher.c
Log:
Renamed execs to exec_path with exec_args, and fixe the bugs with multiple execs.


Modified: initng/initfiles/daemon/fetchmail.ii
==============================================================================
--- initng/initfiles/daemon/fetchmail.ii	(original)
+++ initng/initfiles/daemon/fetchmail.ii	Fri Jan  6 18:46:54 2006
@@ -1,6 +1,6 @@
 daemon daemon/fetchmail {
 	need = system/bootmisc daemon/sendmail;
 	require_network;
-	execs daemon = @/usr/bin/fetchmail@;
+	exec_path daemon = @/usr/bin/fetchmail@;
 	exec_args daemon = -f /etc/fetchmailrc;
 }

Modified: initng/initfiles/daemon/gdm.ii
==============================================================================
--- initng/initfiles/daemon/gdm.ii	(original)
+++ initng/initfiles/daemon/gdm.ii	Fri Jan  6 18:46:54 2006
@@ -5,9 +5,9 @@
 #ifd debian
 	env_file = /etc/default/gdm;
 	# Latest gdm lives in /usr/sbin - temporary workaround
-	execs daemon = /usr/bin/gdm /usr/sbin/gdm;
+	exec_path daemon = /usr/bin/gdm /usr/sbin/gdm;
 #elsed
-	execs daemon = @/usr/sbin/gdm@ ;
+	exec_path daemon = @/usr/sbin/gdm@ ;
 #endd
 	exec_args start = -nodaemon;
 }

Modified: initng/initfiles/daemon/ifplugd.ii
==============================================================================
--- initng/initfiles/daemon/ifplugd.ii	(original)
+++ initng/initfiles/daemon/ifplugd.ii	Fri Jan  6 18:46:54 2006
@@ -14,7 +14,7 @@
 		exec @/usr/sbin/ifplugd@ --no-daemon -i ${NAME} ${A};
 	}
 #elsed
-	execs daemon = @/usr/sbin/ifplugd@;
+	exec_path daemon = @/usr/sbin/ifplugd@;
 	exec_args daemon =  -i ${NAME} --no-daemon;
 #endd
 	#execs kill = @/usr/sbin/ifplugd@;

Modified: initng/initfiles/system/anacron.ii
==============================================================================
--- initng/initfiles/system/anacron.ii	(original)
+++ initng/initfiles/system/anacron.ii	Fri Jan  6 18:46:54 2006
@@ -1,5 +1,5 @@
 service system/anacron {
 	need = system/initial system/clock system/mountfs;
-	execs start = @/usr/sbin/anacron@;
+	exec_path start = @/usr/sbin/anacron@;
 	exec_args start = -s -d;
 }

Modified: initng/plugins/simple_launcher/initng_simple_launcher.c
==============================================================================
--- initng/plugins/simple_launcher/initng_simple_launcher.c	(original)
+++ initng/plugins/simple_launcher/initng_simple_launcher.c	Fri Jan  6 18:46:54 2006
@@ -53,7 +53,7 @@
 
 s_entry EXEC = { "exec", VARIABLE_STRING, NULL, "Contains the path and argumetns to a file to exec." };
 
-s_entry EXECS = { "execs", VARIABLE_STRINGS, NULL,
+s_entry EXECS = { "exec_path", VARIABLE_STRINGS, NULL,
     "The path for one ore more executables."
 };
 s_entry EXEC_ARGS = { "exec_args", VARIABLE_STRING, NULL,
@@ -261,6 +261,7 @@
 static int simple_exec(active_db_h *service, process_h * process)
 {
     const char *exec = NULL;
+    struct stat stat_struct;
     D_("service: %s, process: %s\n", service->name, process->pt->name);
     
     while ((exec = initng_active_db_get_next_string_var(&EXECS, process->pt->name, service, exec)))
@@ -277,6 +278,13 @@
 	    return(FALSE);
 	}
 	
+	/* check if the file exist*/
+	if(stat(exec_fixed, &stat_struct)!=0)
+	{
+	    D_(" note, %s exec_fixed does not exist. \n", exec_fixed);
+	    continue;
+	}
+	
 	/* Try to execute that one */
 	res = simple_exec_try(exec_fixed, service, process);