[Pkg-utopia-commits] r149 - packages/hal/trunk/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2004-12-26 08:01:25 -0700 (Sun, 26 Dec 2004)
New Revision: 149

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal.init.dbus
Log:
Recreate /var/run/hal if necessary

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-12-23 18:13:46 UTC (rev 148)
+++ packages/hal/trunk/debian/changelog	2004-12-26 15:01:25 UTC (rev 149)
@@ -1,3 +1,9 @@
+hal (0.4.2-5) unstable; urgency=high
+
+  * Create /var/run/hal dir on start if it's not there (Closes: #287258)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 26 Dec 2004 15:27:45 +0100
+
 hal (0.4.2-4) unstable; urgency=high
 
   * Only add hal to group cdrom and floppy when creating the user. This way it

Modified: packages/hal/trunk/debian/hal.init.dbus
===================================================================
--- packages/hal/trunk/debian/hal.init.dbus	2004-12-23 18:13:46 UTC (rev 148)
+++ packages/hal/trunk/debian/hal.init.dbus	2004-12-26 15:01:25 UTC (rev 149)
@@ -11,10 +11,11 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/hald
+PIDDIR=/var/run/hal
+PIDFILE=$PIDDIR/hald.pid
 NAME=hald
+DAEMONUSER=hal
 DESC="Hardware abstraction layer"
-USER=root
-PIDFILE=/var/run/hal/hald.pid
 
 test -x $DAEMON || exit 0
 
@@ -25,19 +26,31 @@
 
 set -e
 
-case "$1" in
-  start)
+do_start() {
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER:$DAEMONUSER $PIDDIR
+  fi
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --pidfile $PIDFILE \
 		--exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."
-	;;
-  stop)
+}
+
+do_stop() {
 	echo -n "Stopping $DESC: "
 	start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \
 		--exec $DAEMON 
 	echo "$NAME."
+}
+
+case "$1" in
+  start)
+    do_start
 	;;
+  stop)
+    do_stop
+	;;
   #reload)
 	#
 	#	If the daemon can reload its config files on the fly
@@ -56,13 +69,9 @@
 	#	option to the "reload" entry above. If not, "force-reload" is
 	#	just the same as "restart".
 	#
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \
-		--exec $DAEMON 
+  do_stop
 	sleep 5
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+  do_start
 	;;
   *)
 	N=/etc/init.d/$NAME