[Initng-svn] r2665 - initng/initfiles/daemon

[svn at initng.thinktux.net]

Author: trigger
Date: Sun Jan  1 16:17:45 2006
New Revision: 2665

Modified:
   initng/initfiles/daemon/hald.ii
Log:
Undo the changes in hald.ii - hald is not immediately up after it is started. This is why we really have to use the pid file. Otherwise services depending on hald can fail. Don't remember the bug #, but we already had this case.

Modified: initng/initfiles/daemon/hald.ii
==============================================================================
--- initng/initfiles/daemon/hald.ii	(original)
+++ initng/initfiles/daemon/hald.ii	Sun Jan  1 16:17:45 2006
@@ -1,10 +1,21 @@
 daemon daemon/hald {
 	need = system/bootmisc daemon/dbus;
-
-	stdall = /dev/null;
 #ifdd debian
+	env PIDDIR=/var/run/hal;
+	env DAEMONUSER=hal;
 	env_file = /etc/default/hal;
-	exec daemon = @/usr/sbin/hald@ ${DAEMON_OPTS} --daemon=no;
+	pid_file = ${PIDDIR}/hald.pid;
+#endd
+	stdall = /dev/null;
+#ifd debian
+	script daemon = {
+		if [ ! -d ${PIDDIR} ]
+		then
+			@mkdir@ -p ${PIDDIR}
+			chown ${DAEMONUSER}:${DAEMONUSER} ${PIDDIR}
+		fi
+		@/usr/sbin/hald@ ${DAEMON_OPTS}
+	};
 #elsed gentoo
 	exec daemon = @/usr/sbin/hald@ --retain-privileges;
 	exec daemon = @/usr/sbin/hald@ --drop-privileges;