# HG changeset patch
# User Dominique Corbex <domcox@users.sourceforge.net>
# Date 1240066665 -7200
# Node ID 320b5d1cf5fc5dd53a5ee3a09f4f2f7a16458092
# Parent  d0efd4654127c101e1499691076fb0bc18c40ba7
acpid: up to 1.0.8

diff -r d0efd4654127 -r 320b5d1cf5fc acpid/receipt
--- a/acpid/receipt	Sat Apr 18 17:51:16 2009 +0200
+++ b/acpid/receipt	Sat Apr 18 16:57:45 2009 +0200
@@ -1,8 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="acpid"
-VERSION="1.0.6"
-EXTRAVERSION="-3"
+VERSION="1.0.8"
 CATEGORY="system-tools"
 SHORT_DESC="The ACPI event daemon"
 MAINTAINER="domcox@users.sourceforge.net"
diff -r d0efd4654127 -r 320b5d1cf5fc acpid/stuff/init.d/acpid
--- a/acpid/stuff/init.d/acpid	Sat Apr 18 17:51:16 2009 +0200
+++ b/acpid/stuff/init.d/acpid	Sat Apr 18 16:57:45 2009 +0200
@@ -12,37 +12,36 @@
 DESC="ACPI event deamon"
 DAEMON=/usr/sbin/acpid
 OPTIONS=$ACPID_OPTIONS
-NPID=`ps ax | grep $DAEMON | wc -l`
-PID=`ps ax | grep $DAEMON | awk '{print $1}'`
+PIDFILE=/var/run/acpid.pid
 
 case "$1" in
   start)
-    if [ $NPID -ne 0  ] ; then
+    if [ -f $PIDFILE ] ; then
       echo "$NAME already running."
       exit 1
     fi
     echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS > /dev/null
+    $DAEMON $OPTIONS
     status
     ;;
   stop)
-    if [ $NPID -eq 0 ] ; then
+    if [ ! -f $PIDFILE ] ; then
       echo "$NAME is not running."
       exit 1
     fi
     echo -n "Stopping $DESC: $NAME... "
-    kill $PID
+    kill `cat $PIDFILE`
     status
     ;;
   restart)
-    if [ $NPID -eq 0 ] ; then
+    if [ ! -f $PIDFILE ] ; then
       echo "$NAME is not running."
       exit 1
     fi
     echo -n "Restarting $DESC: $NAME... "
-    kill $PID
+    kill `cat $PIDFILE`
     sleep 2
-    $DAEMON $OPTIONS > /dev/null
+    $DAEMON $OPTIONS
     status
     ;;
   *)