Check for /dev/input/mice before starting GPM

diff --git a/autoconfig.functions b/autoconfig.functions
index 8197d4b..94f786c 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1639,10 +1639,14 @@ config_gpm(){
  if checkbootparam "nogpm"; then
   ewarn "Not starting GPM as requested on boot commandline." ; eend 0
  else
  if checkbootparam "nogpm"; then
   ewarn "Not starting GPM as requested on boot commandline." ; eend 0
  else

-  einfo "Starting gpm in background."
-#  /etc/init.d/gpm start 1>>$DEBUG &
-  ( while [ ! -e /dev/psaux ]; do sleep 5; done; /etc/init.d/gpm start 1>>$DEBUG ) &
-  eend 0
+   if ! [ -r /dev/input/mice ] ; then
+      eerror "No mouse found - not starting GPM." ; eend 1
+   else
+      einfo "Starting gpm in background."
+      /etc/init.d/gpm start 1>>$DEBUG &
+      # ( while [ ! -e /dev/psaux ]; do sleep 5; done; /etc/init.d/gpm start 1>>$DEBUG ) &
+      eend 0
+   fi

  fi
 }
 # }}}
  fi
 }
 # }}}

diff --git a/debian/changelog b/debian/changelog
index d3110d6..be1d370 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.8.9) unstable; urgency=low
+
+  * Check for /dev/input/mice before starting GPM.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 17 Jul 2008 20:53:10 +0200
+

 grml-autoconfig (0.8.8) unstable; urgency=low
 
   * Mention job handling stuff when using debug=noscreen.
 grml-autoconfig (0.8.8) unstable; urgency=low
 
   * Mention job handling stuff when using debug=noscreen.