rpms/acpid/F-8 acpid.init,1.4,1.5 acpid.spec,1.23,1.24

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/acpid/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv764

Modified Files:
	acpid.init acpid.spec 
Log Message:
Silent initscript
Resolves: #345611



Index: acpid.init
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-8/acpid.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- acpid.init	26 Sep 2007 13:49:40 -0000	1.4
+++ acpid.init	23 Oct 2007 16:03:28 -0000	1.5
@@ -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 @@
 #
 
 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 @@
 
 restart() {
 	stop
-	start
+	start $@
 }	
 
 reload() {
@@ -73,7 +72,7 @@
 
 case "$1" in
 start)
-	start
+	start $2
 	;;
 stop)
 	stop
@@ -86,11 +85,11 @@
 	RETVAL=3
 	;;
 restart)
-	restart
+	restart $2
 	;;
 condrestart)
 	if [ -f /var/lock/subsys/acpid ]; then
-	    restart
+	    restart $2
 	fi
 	;;
 status)


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-8/acpid.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- acpid.spec	26 Sep 2007 13:49:40 -0000	1.23
+++ acpid.spec	23 Oct 2007 16:03:28 -0000	1.24
@@ -87,6 +87,10 @@
 fi
 
 %changelog
+* Thu Oct 23 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-3.fc8
+- Silent initscript
+- Resolves: #345611
+
 * Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-2.fc8
 - Fixed leak of a file descriptor
 - Resolves: #304761