diff --git a/gpm.init b/gpm.init index af0c20c..041a385 100755 --- a/gpm.init +++ b/gpm.init @@ -11,17 +11,22 @@ # source function library . /etc/init.d/functions -[ -e /etc/sysconfig/gpm ] && . /etc/sysconfig/gpm -MOUSECFG=/etc/sysconfig/gpm +if test -e /etc/sysconfig/mouse +then + source /etc/sysconfig/mouse + MOUSECFG=/etc/sysconfig/mouse +elif test -e /etc/sysconfig/gpm +then + source /etc/sysconfig/gpm + MOUSECFG=/etc/sysconfig/gpm +fi RETVAL=0 start() { echo -n $"Starting console mouse services: " - if [ -f "$MOUSECFG" ]; then - . "$MOUSECFG" - else + if [ -z "$MOUSECFG" ]; then echo $"(no mouse is configured)" exit 0 fi diff --git a/gpm.spec b/gpm.spec index 52963d7..126241d 100644 --- a/gpm.spec +++ b/gpm.spec @@ -172,9 +172,9 @@ fi %{_libdir}/libgpm.so %changelog -* Thu Sep 23 2004 Adrian Havill 1.20.1-53 -- change mouse config file from /etc/sysconfig/mouse to /etc/sysconfig/gpm - (#133141) +* Thu Sep 23 2004 Adrian Havill 1.20.1-54 +- change init so that MOUSECFG fallsback to /etc/sysconfig/gpm if + /etc/sysconfig/mouse doesn't exist (#133141) - fixed compile vs new kernheaders (#131783) * Tue May 04 2004 Adrian Havill 1.20.1-49