From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9930138359 for ; Thu, 5 Nov 2020 23:49:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6AC8E0833; Thu, 5 Nov 2020 23:49:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D8F7E0833 for ; Thu, 5 Nov 2020 23:49:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0260633BEB9 for ; Thu, 5 Nov 2020 23:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43DB63A2 for ; Thu, 5 Nov 2020 23:49:45 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1604618914.15d17333c8e7e5ef038ea288ccc98522c51f4fba.mattst88@gentoo> Subject: [gentoo-commits] proj/livecd-tools:master commit in: init.d/ X-VCS-Repository: proj/livecd-tools X-VCS-Files: init.d/autoconfig init.d/gpm-pre X-VCS-Directories: init.d/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 15d17333c8e7e5ef038ea288ccc98522c51f4fba X-VCS-Branch: master Date: Thu, 5 Nov 2020 23:49:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b311b642-e87b-439c-aed7-d38a2022dd4b X-Archives-Hash: 9b68e0df2c20484eb111cef658cc305c commit: 15d17333c8e7e5ef038ea288ccc98522c51f4fba Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Nov 5 03:15:13 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 5 23:28:34 2020 +0000 URL: https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=15d17333 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 gentoo.org> Signed-off-by: Matt Turner gmail.com> init.d/autoconfig | 9 --------- init.d/gpm-pre | 33 --------------------------------- 2 files changed, 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: