From owner-cvs-src@FreeBSD.ORG Mon Nov 1 18:05:41 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 815B116A4CE; Mon, 1 Nov 2004 18:05:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 709AA43D48; Mon, 1 Nov 2004 18:05:41 +0000 (GMT) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1I5f6f040915; Mon, 1 Nov 2004 18:05:41 GMT (envelope-from mtm@repoman.freebsd.org) Received: (from mtm@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1I5fCZ040914; Mon, 1 Nov 2004 18:05:41 GMT (envelope-from mtm) Message-Id: <200411011805.iA1I5fCZ040914@repoman.freebsd.org> From: Mike Makonnen Date: Mon, 1 Nov 2004 18:05:41 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/etc usbd.conf src/etc/defaults rc.conf src/etc/rc.d moused src/share/man/man5 rc.conf.5 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 18:05:41 -0000 mtm 2004-11-01 18:05:41 UTC FreeBSD src repository Modified files: etc usbd.conf etc/defaults rc.conf etc/rc.d moused share/man/man5 rc.conf.5 Log: Do a better job of supporting more than one mouse device on the system. To start/stop/check on a specific device give the device name as the second argument to the script: # /etc/rc.d/moused start ums0 To use different rc.conf(5) knobs with different mice use the device name as part of the knob. For example, if the mouse device is ums0, then: moused_ums0_enable=yes moused_ums0_flags="-z 4" moused_ums0_port="/dev/ums0" Starting rc.d/moused without the device argument will use the standard moused_* flags. So, this commit should not disrupt or change current usage. To preserve current behaviour with respect to usb mice, which appear automatically when inserted, there is a new knob, moused_nondefault_enable, which will treat any devices without rc.conf knobs as enabled. To minimize knobs in /etc/rc.conf, the device file and pid file are auto-computed, so that in the typical case for a usb mouse you don't need to add anything extra in /etc/rc.conf to get it working. Additionally, this updates /etc/usbd.conf to use the rc.d/moused script so people don't have to modify it to configure their usb mouse anymore. MFC after: 1 month Revision Changes Path 1.228 +2 -0 src/etc/defaults/rc.conf 1.8 +39 -4 src/etc/rc.d/moused 1.13 +1 -1 src/etc/usbd.conf 1.234 +15 -0 src/share/man/man5/rc.conf.5