diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-11-04 19:15:13 -0800 |
|---|---|---|
| committer |   Matt Turner <mattst88@gmail.com> | 2020-11-05 18:28:34 -0500 |
| commit | 15d17333c8e7e5ef038ea288ccc98522c51f4fba (patch) | |
| tree | 6f8dd92bad1d3864ab19944af9ee7e0b4b764f60 | |
| parent | save a grep and a count (diff) | |
| download | livecd-tools-15d17333c8e7e5ef038ea288ccc98522c51f4fba.tar.gz livecd-tools-15d17333c8e7e5ef038ea288ccc98522c51f4fba.tar.bz2 livecd-tools-15d17333c8e7e5ef038ea288ccc98522c51f4fba.zip | |
remove special mouse handling and pre-gpm script
nowadays mice are available via /dev/input/mice, which
gpm defaults to open at startup.
INPUT_MOUSEDEV description:
Say Y here if you want your mouse to be accessible as char devices
13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an emulated
IntelliMouse Explorer PS/2 mouse. That way, all user space programs
(including SVGAlib, GPM and X) will be able to use your mouse.
The data available through /dev/psaux is exactly the same as the data
from /dev/input/mice.
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | init.d/autoconfig | 9 | ||||
| -rw-r--r-- | init.d/gpm-pre | 33 |
2 files changed, 0 insertions, 42 deletions
diff --git a/init.d/autoconfig b/init.d/autoconfig index 9bc3a38..f541a0c 100644 --- a/init.d/autoconfig +++ b/init.d/autoconfig @@ -232,7 +232,6 @@ list_services() { then echo hwsetup fi - svcs="${svcs} $(check_svc ${GPM} gpm-pre)" svcs="${svcs} $(check_svc ${GPM} gpm)" svcs="${svcs} $(check_svc ${IDEDMA} hdparm)" svcs="${svcs} $(check_svc ${NFS} nfsclient)" @@ -522,14 +521,6 @@ start() { # Read in what hwsetup has found [ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo - # Mouse - # FIXME: If MOUSE_DEVICE is empty, we actually do not want to do anything, not even start gpm. - if [ -n "${MOUSE_DEVICE}" ] - then - : - # Migrated to autoconfig-gpm-pre - fi - if yesno "${DETECT}" then NETDEVICES="$(detect_netdevices)" diff --git a/init.d/gpm-pre b/init.d/gpm-pre deleted file mode 100644 index a03e881..0000000 --- a/init.d/gpm-pre +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - before gpm - need hwsetup -} - -start() { - [ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo - [ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse - if [ -z "${MOUSE_DEVICE}" ]; then - ewarn "No mouse detected. GPM will not be started." - return 0 - fi - einfo "Mouse is ${HILITE}${MOUSE_FULLNAME}${NORMAL} at ${HILITE}${MOUSE_DEVICE}${NORMAL} ..." - - if [ $(grep "#MOUSE=${MOUSETYPE}" /etc/conf.d/gpm) ]; then - sed -i "\@MOUSE=${MOUSETYPE}@s@^#@@" /etc/conf.d/gpm - else - echo "MOUSE=${MOUSETYPE}" >>/etc/conf.d/gpm - fi - - if [ $(grep "#MOUSEDEV=${DEVICE}" /etc/conf.d/gpm) ]; then - sed -i "\@MOUSEDEV=${DEVICE}@s@^#@@" /etc/conf.d/gpm - else - echo "MOUSEDEV=${DEVICE}" >>/etc/conf.d/gpm - fi -} - -# vim: ft=gentoo-init-d: |