From 76c0dde904b8860ac07897f84c06ddb6030b457c Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@fedoraproject.org>
Date: Oct 23 2007 08:08:30 +0000
Subject: Errors from init script are logged Resolves: #345611


---

diff --git a/acpid.init b/acpid.init
index ea49092..3990086 100755
--- a/acpid.init
+++ b/acpid.init
@@ -30,18 +30,18 @@ RETVAL=0
 start() {
 	# Check if acpid is executable
 	if [ ! -x /usr/sbin/acpid ]; then
-		echo "$0: acpid is not executable."
+		logger -p daemon.error -t $0 "/usr/sbin/acpid is not executable."
 		exit 1
 	fi
 	# Check for kernel support
 	if [ ! -f /proc/acpi/event ]; then
-		echo "$0: need ACPI_PROC_EVENT support in kernel."  //zmena podle 260181
+		logger -p daemon.error -t $0 "need ACPI_PROC_EVENT support in kernel."
 		exit 1
 	fi
 	# Check if it is already running
 	if [ ! -f /var/lock/subsys/acpid ]; then
 	    echo -n $"Starting acpi daemon: "
-	    daemon /usr/sbin/acpid
+	    daemon /usr/sbin/acpid $@
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid
 	    echo
@@ -61,7 +61,7 @@ stop() {
 
 restart() {
 	stop
-	start
+	start $@
 }	
 
 reload() {
@@ -73,7 +73,7 @@ reload() {
 
 case "$1" in
 start)
-	start
+	start $2
 	;;
 stop)
 	stop
@@ -86,11 +86,11 @@ force-reload)
 	RETVAL=3
 	;;
 restart)
-	restart
+	restart $2
 	;;
 condrestart)
 	if [ -f /var/lock/subsys/acpid ]; then
-	    restart
+	    restart $2
 	fi
 	;;
 status)
diff --git a/acpid.spec b/acpid.spec
index 1779516..4a7d7bd 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -87,6 +87,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Oct 11 2007 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.6-3.fc9
+- Errors from init script are logged
+- Resolves: #345611
+
 * Wed Sep 26 2007 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.6-2.fc8
 - Fixed leak of a file descriptor
 - Resolves: #304761