From 23a9ea3f46746ed6e8a56102b49fdd96b2755f6c Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@fedoraproject.org>
Date: Oct 09 2004 08:25:09 +0000
Subject: - initscript cleanup


---

diff --git a/gpm.init b/gpm.init
index 041a385..be42f7f 100755
--- a/gpm.init
+++ b/gpm.init
@@ -12,13 +12,11 @@
 # source function library
 . /etc/init.d/functions
 
-if test -e /etc/sysconfig/mouse
-then
-    source /etc/sysconfig/mouse
+if test -e /etc/sysconfig/mouse ; then
+    . /etc/sysconfig/mouse
     MOUSECFG=/etc/sysconfig/mouse
-elif test -e /etc/sysconfig/gpm
-then
-    source /etc/sysconfig/gpm
+elif test -e /etc/sysconfig/gpm ; then
+    . /etc/sysconfig/gpm
     MOUSECFG=/etc/sysconfig/gpm
 fi
 
@@ -42,7 +40,7 @@ start() {
 	fi
 
 	if [ -z "$DEVICE" ]; then
-	    DEVICE="/dev/mouse"
+	    DEVICE="/dev/input/mice"
 	fi
 	
 	if [ -n "$IMOUSETYPE" ]; then
@@ -80,13 +78,11 @@ case "$1" in
   restart|reload)
 	stop
 	start
-	RETVAL=$?
 	;;
   condrestart)
 	if [ -f /var/lock/subsys/gpm ]; then
 	    stop
 	    start
-	    RETVAL=$?
 	fi
 	;;
   status)
@@ -99,4 +95,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-
diff --git a/gpm.spec b/gpm.spec
index 6cd000e..5fb9f27 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 54
+Release: 55
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -172,6 +172,9 @@ fi
 %{_libdir}/libgpm.so
 
 %changelog
+* Sat Oct 09 2004 Florian La Roche <Florian.LaRoche@redhat.de>
+- initscript cleanup
+
 * Thu Sep 23 2004 Adrian Havill <havill@redhat.com> 1.20.1-54
 - change init so that MOUSECFG fallsback to /etc/sysconfig/gpm if
   /etc/sysconfig/mouse doesn't exist (#133141)