From 76c3694339d2c9b15f4aa884b5d2bd2482f6af81 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@fedoraproject.org>
Date: Oct 23 2007 16:03:28 +0000
Subject: Silent initscript Resolves: #345611


---

diff --git a/acpid.init b/acpid.init
index ea49092..63ce97e 100755
--- a/acpid.init
+++ b/acpid.init
@@ -21,6 +21,15 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+# Check that we're a priviledged user
+[ `id -u` = 0 ] || exit 1
+
+# Check if acpid is executable
+test -x /usr/sbin/acpid || exit 1
+
+# Check for kernel support
+[ -f /proc/acpi/event ] || exit 1
+
 RETVAL=0
 
 #
@@ -28,20 +37,10 @@ RETVAL=0
 #
 
 start() {
-	# Check if acpid is executable
-	if [ ! -x /usr/sbin/acpid ]; then
-		echo "$0: 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
-		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
+		echo -n $"Starting acpi daemon: "	
+	    daemon /usr/sbin/acpid $@
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid
 	    echo
@@ -61,7 +60,7 @@ stop() {
 
 restart() {
 	stop
-	start
+	start $@
 }	
 
 reload() {
@@ -73,7 +72,7 @@ reload() {
 
 case "$1" in
 start)
-	start
+	start $2
 	;;
 stop)
 	stop
@@ -86,11 +85,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..626c851 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -87,6 +87,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Oct 23 2007 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.6-3.fc8
+- Silent initscript
+- Resolves: #345611
+
 * Wed Sep 26 2007 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.6-2.fc8
 - Fixed leak of a file descriptor
 - Resolves: #304761