initng/daemon: cupsd.i gpm.i klogd.i lighttpd.i syslog-ng.i syslog.i

[glen]

Author: glen
Date: Sun Dec 11 13:33:07 2005
New Revision: 6636

Modified:
   initng/daemon/cupsd.i
   initng/daemon/gpm.i
   initng/daemon/klogd.i
   initng/daemon/lighttpd.i
   initng/daemon/syslog-ng.i
   initng/daemon/syslog.i
Log:
- use rc-scripts to handle restarts from logrotate

Modified: initng/daemon/cupsd.i
==============================================================================
--- initng/daemon/cupsd.i	(original)
+++ initng/daemon/cupsd.i	Sun Dec 11 13:33:07 2005
@@ -1,7 +1,9 @@
 daemon daemon/cupsd {
-	need = system/initial system/checkroot;
+	need = system/initial system/checkroot system/rundir;
 	require_network;
 
-	exec daemon = /usr/sbin/cupsd;
-	exec_args daemon = -f -c /etc/cups/cupsd.conf;
+	exec start = /etc/rc.d/init.d/cups;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/cups;
+	exec_args stop = stop;
 }

Modified: initng/daemon/gpm.i
==============================================================================
--- initng/daemon/gpm.i	(original)
+++ initng/daemon/gpm.i	Sun Dec 11 13:33:07 2005
@@ -1,6 +1,8 @@
 daemon daemon/gpm {
 	need = system/sysinit system/rundir;
-	exec daemon = /usr/sbin/gpm;
-	exec_args daemon = -m /dev/input/mice -t imps2;
-	pid_file = /var/run/gpm.pid;
+
+	exec start = /etc/rc.d/init.d/klogd;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/klogd;
+	exec_args stop = stop;
 }

Modified: initng/daemon/klogd.i
==============================================================================
--- initng/daemon/klogd.i	(original)
+++ initng/daemon/klogd.i	Sun Dec 11 13:33:07 2005
@@ -4,9 +4,10 @@
 #		It is a good idea to always run klogd.
 
 daemon daemon/klogd {
-#	need = system/initial system/mountroot
-	need = system/sysinit daemon/syslog;
+	need = system/sysinit daemon/syslog system/rundir;
 
-	exec daemon = /sbin/klogd;
-	exec_args daemon = -c 1;
+	exec start = /etc/rc.d/init.d/klogd;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/klogd;
+	exec_args stop = stop;
 }

Modified: initng/daemon/lighttpd.i
==============================================================================
--- initng/daemon/lighttpd.i	(original)
+++ initng/daemon/lighttpd.i	Sun Dec 11 13:33:07 2005
@@ -1,8 +1,9 @@
 daemon daemon/lighttpd {
-	need = system/localmount system/modules system/hostname;
-	use = system/static-modules system/coldplug;
+	need = system/sysinit daemon/syslog system/rundir;
 	require_network;
 
-	exec daemon = /usr/sbin/lighttpd;
-	exec_args daemon = -D -f /etc/lighttpd/lighttpd.conf;
+	exec start = /etc/rc.d/init.d/lighttpd;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/lighttpd;
+	exec_args stop = stop;
 }

Modified: initng/daemon/syslog-ng.i
==============================================================================
--- initng/daemon/syslog-ng.i	(original)
+++ initng/daemon/syslog-ng.i	Sun Dec 11 13:33:07 2005
@@ -1,6 +1,8 @@
 daemon daemon/syslog-ng {
-	need = system/initial system/clock system/hostname system/mountfs;
-	#provide = logger
-	exec daemon = /usr/sbin/syslog-ng;
-	exec_args daemon = -F -p /var/run/syslog-ng.pid;
+	need = system/initial system/clock system/hostname system/mountfs system/rundir;
+
+	exec start = /etc/rc.d/init.d/syslog-ng;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/syslog-ng;
+	exec_args stop = stop;
 }

Modified: initng/daemon/syslog.i
==============================================================================
--- initng/daemon/syslog.i	(original)
+++ initng/daemon/syslog.i	Sun Dec 11 13:33:07 2005
@@ -5,10 +5,10 @@
 # run syslog.
 
 daemon daemon/syslog {
-#	need = system/initial system/mountroot
-# TODO system/mountvar
 	need = system/sysinit system/mountroot system/hostname system/rundir;
 
-	exec daemon = /sbin/syslogd;
-	exec_args daemon = -m 0;
+	exec start = /etc/rc.d/init.d/syslog;
+	exec_args start = start;
+	exec stop = /etc/rc.d/init.d/syslog;
+	exec_args stop = stop;
 }