rpms/acpid/devel acpid.init,1.7,1.8

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26377

Modified Files:
	acpid.init 
Log Message:
Fixed initscritp



Index: acpid.init
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acpid.init	23 Oct 2007 15:05:39 -0000	1.7
+++ acpid.init	23 Oct 2007 15:48:58 -0000	1.8
@@ -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
 
 #
@@ -30,16 +39,6 @@
 start() {
 	# Check if it is already running
 	if [ ! -f /var/lock/subsys/acpid ]; then
-		# Check if acpid is executable
-		if [ ! -x /usr/sbin/acpid ]; then
-			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
-			logger -p daemon.error -t $0 "need ACPI_PROC_EVENT support in kernel."
-			exit 1
-		fi
 		echo -n $"Starting acpi daemon: "	
 	    daemon /usr/sbin/acpid $@
 	    RETVAL=$?