- initscript cleanup

This commit is contained in:
Florian La Roche 2004-10-09 08:25:09 +00:00
parent f96d9b06b9
commit 23a9ea3f46
2 changed files with 9 additions and 11 deletions

View File

@ -12,13 +12,11 @@
# source function library # source function library
. /etc/init.d/functions . /etc/init.d/functions
if test -e /etc/sysconfig/mouse if test -e /etc/sysconfig/mouse ; then
then . /etc/sysconfig/mouse
source /etc/sysconfig/mouse
MOUSECFG=/etc/sysconfig/mouse MOUSECFG=/etc/sysconfig/mouse
elif test -e /etc/sysconfig/gpm elif test -e /etc/sysconfig/gpm ; then
then . /etc/sysconfig/gpm
source /etc/sysconfig/gpm
MOUSECFG=/etc/sysconfig/gpm MOUSECFG=/etc/sysconfig/gpm
fi fi
@ -42,7 +40,7 @@ start() {
fi fi
if [ -z "$DEVICE" ]; then if [ -z "$DEVICE" ]; then
DEVICE="/dev/mouse" DEVICE="/dev/input/mice"
fi fi
if [ -n "$IMOUSETYPE" ]; then if [ -n "$IMOUSETYPE" ]; then
@ -80,13 +78,11 @@ case "$1" in
restart|reload) restart|reload)
stop stop
start start
RETVAL=$?
;; ;;
condrestart) condrestart)
if [ -f /var/lock/subsys/gpm ]; then if [ -f /var/lock/subsys/gpm ]; then
stop stop
start start
RETVAL=$?
fi fi
;; ;;
status) status)
@ -99,4 +95,3 @@ case "$1" in
esac esac
exit $RETVAL exit $RETVAL

View File

@ -1,7 +1,7 @@
Summary: A mouse server for the Linux console. Summary: A mouse server for the Linux console.
Name: gpm Name: gpm
Version: 1.20.1 Version: 1.20.1
Release: 54 Release: 55
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@ -172,6 +172,9 @@ fi
%{_libdir}/libgpm.so %{_libdir}/libgpm.so
%changelog %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 * Thu Sep 23 2004 Adrian Havill <havill@redhat.com> 1.20.1-54
- change init so that MOUSECFG fallsback to /etc/sysconfig/gpm if - change init so that MOUSECFG fallsback to /etc/sysconfig/gpm if
/etc/sysconfig/mouse doesn't exist (#133141) /etc/sysconfig/mouse doesn't exist (#133141)