From nobody Sun Sep 21 13:16:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cV6Fk384zz686LM; Sun, 21 Sep 2025 13:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cV6Fk1rPVz3kW7; Sun, 21 Sep 2025 13:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758460586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6p0B0EKkAKYm3VRdXNJ/0TE/YXEM6g3LXxFazHu14c=; b=Lp+TpsJitkMQAs+uWqKIvDy0CSYFB78NwG7+lyDTCAHUULpog1vdHviZp6XCj6UxOLNgeB glXYeZhpyebTljqDKqxdl7I29mnWP8ixZiUwTAfKU4EHiNU9GU2w7o+A1twS0Q3KafFxre psDsInKWq6u4f7TsQYnbV6odiSbIXtJUH8RQDn0+1HAIo7La1voO/Kvs2NvJsbUugV90IZ tpKanNlW0TLJuJLPYghLr2CTQC8uwxfa04+U+CBbGkqB6lQ4xI0ldTk9iE1LGn3/q80rxa S71dssViPiDxQ73T1UHalqqSEoo9jlBAen3Z1Kj+Jk1HSHW587EzKPJ6xl7ixw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758460586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6p0B0EKkAKYm3VRdXNJ/0TE/YXEM6g3LXxFazHu14c=; b=kB+5gOwuNyTFbGth0fjzFcTO7X+U1oXrrD1aWc53zhoEZg5S+EmDEyo8RzlQpazKbHfGwK YkHpwdBvsOELixrGjtLVWCmsJ1ZAJYkL3KjsHVZXfT2bGdd5l+ftv1riOZLEAuuk/m3ZmK Yg32UI1SGgG121DqE/TIJnuLxhtXuBsKm8q4TjoVWVyyVWVGjtGjS43Y4/gE55iXOK6RHT 1edW10tGcCrCUHx5MvGbRRpTGCDVCP+Jl4DGUbF8hvoB56nmDY2qkL9/g68dhsAfIi6sOt A9McNzgdRH8x4DYImHoqQ+HSveSALGfPBF+zpXViVIkR8hbAtVir6FTrDkXQCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758460586; a=rsa-sha256; cv=none; b=CXbQ8jfz06++GJrfuUr1PifGZdTfGbHllErMBT8XTNzxv4dF0SgV4lNQjZTdH/N1EX4cyU j+o2iX/SQ4NOarOi3LcsZy8GtP7wkIBzjNyzpp5lGDPHwM0ZztSPCsr03q4ZI3KiLBi/RT +3yM3DZtQ84cA9+mE/CtFAJjLAAgANYHHaGBkd5NHeZ4EjMJ1DfAjpZduHpDhzier5UQ34 bx5V2S9QmhQ9NHojR9+U6C8feCEXKg2+0NRpHtbbHfaygywgMsCa3oAEpADx3h4Y5UT0iF MGvbK4/1Y4PnTqpF8AbY51DmzLh2X2Jq9yJi3bAL8Ct65gvn4F1nG8xf3fPcTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cV6Fk1BWPz1Mx; Sun, 21 Sep 2025 13:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58LDGQn1033190; Sun, 21 Sep 2025 13:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LDGQw0033187; Sun, 21 Sep 2025 13:16:26 GMT (envelope-from git) Date: Sun, 21 Sep 2025 13:16:26 GMT Message-Id: <202509211316.58LDGQw0033187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 66e7f048f0c8 - main - moused(8): Start moused with devd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66e7f048f0c8e9e726738fadd9dc819bfda3cbfe Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=66e7f048f0c8e9e726738fadd9dc819bfda3cbfe commit 66e7f048f0c8e9e726738fadd9dc819bfda3cbfe Author: Vladimir Kondratyev AuthorDate: 2025-09-21 13:14:49 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-09-21 13:14:49 +0000 moused(8): Start moused with devd It is appeared that currently starting of moused does not depend on moused_enable variable value in rc.conf. That leads to missing USB mice support in default configuration. Start moused in traditional per device mode with devd to follow POLA. One daemon per system mode still can be enabled with setting of moused_port="auto" moused_nondefault_enable="NO" variables in /etc/rc.conf To revert to sysmouse mode add moused_type="sysmouse" to /etc/rc.conf Reported by: many Requested by: glebius Reviewed by: glebius MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52430 --- libexec/rc/rc.conf | 4 ++-- libexec/rc/rc.d/moused | 11 ++++++----- sbin/devd/moused.conf | 9 +++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index b5482f081ce5..1220d060232d 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -586,11 +586,11 @@ font8x14="NO" # font 8x14 from /usr/share/{syscons,vt}/fonts/* (or NO). font8x8="NO" # font 8x8 from /usr/share/{syscons,vt}/fonts/* (or NO). blanktime="300" # blank time (in seconds) or "NO" to turn it off. saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko -moused_nondefault_enable="NO" # Treat non-default mice as enabled unless +moused_nondefault_enable="YES" # Treat non-default mice as enabled unless # specifically overridden in rc.conf(5). moused_enable="NO" # Run the mouse daemon. moused_type="evdev" # See man page for rc.conf(5) for available settings. -moused_port="auto" # Set to your mouse port. +moused_port="/dev/psm0" # Set to your mouse port. moused_flags="" # Any additional flags to moused. mousechar_start="NO" # if 0xd0-0xd3 default range is occupied in your # language code table, specify alternative range diff --git a/libexec/rc/rc.d/moused b/libexec/rc/rc.d/moused index 64e4f815eea9..35a26bd57275 100755 --- a/libexec/rc/rc.d/moused +++ b/libexec/rc/rc.d/moused @@ -28,9 +28,10 @@ moused_svcj="NO" # expected to be the mouse device. # if [ -n "$2" ]; then - eval moused_$2_enable=\${moused_$2_enable-${moused_nondefault_enable}} - rcvar="moused_${2}_enable" - pidfile="${pidprefix}.$2.pid" + ms=`basename $2` + eval moused_${ms}_enable=\${moused_${ms}_enable-${moused_nondefault_enable}} + rcvar="moused_${ms}_enable" + pidfile="${pidprefix}.${ms}.pid" pidarg="-I $pidfile" fi @@ -45,10 +46,10 @@ moused_start() # the moused_port variable, which if not defined sets it to the # passed in device name. # - ms=$1 + ms=`basename $1` if [ -n "$ms" ]; then eval myflags=\${moused_${ms}_flags-$moused_flags} - eval myport=\${moused_${ms}_port-/dev/$ms} + eval myport=\${moused_${ms}_port-/dev/$1} eval mytype=\${moused_${ms}_type-$moused_type} if [ -n "$mytype" ] && check_kern_features evdev_support; then typearg="-t ${mytype}" diff --git a/sbin/devd/moused.conf b/sbin/devd/moused.conf index ed1060ffdf2e..8821c2bb8375 100644 --- a/sbin/devd/moused.conf +++ b/sbin/devd/moused.conf @@ -33,3 +33,12 @@ notify 100 { action "service moused quietstop $cdev"; }; + +notify 100 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "CREATE"; + match "cdev" "input/event[0-9]+"; + + action "service moused quietstart $cdev"; +};