From nobody Sat May 21 14:42:54 2022 X-Original-To: dev-commits-src-main@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 CAF331AE7AFF; Sat, 21 May 2022 14:42:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L55t65LbCz3tk6; Sat, 21 May 2022 14:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653144174; 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=3viLWPqXZFlsNDA9TwdVCdYi1p2fUnIRR9/O1xEpgKM=; b=Sk0e7Im0E0FGIKw05WD58b4WM63Oja1DLeCW0TaJbe9my4TRTRT2buZdxI5uNQQiBOirXE nhnoRwQWkO7FiNW4JqVzoRV4NOpAxvo6rQ9G9Vou7eKUS730Bs5o/ZxCWrwnlQbyNgD0WR MeVaQ/5A9098bgCxw5ZfyOhLj8Lcgi291KI4kD+G+DcWnS+JpKz3c8rTBpK7f+ntUPmmPX gfOqEQCL+iAHIe2lQzHBPrlzchJrnhxd1Az6G0uN2jwN3c36kXXT9R4mwNtgOqetN+j3zY j2jdDkXRJXR/3KNweb58gEGA9TdbZLjYtW+EiQE92aU9DCrw2lO3b2cDge4iSA== 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 97C0B852; Sat, 21 May 2022 14:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24LEgs19085402; Sat, 21 May 2022 14:42:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24LEgsv9085401; Sat, 21 May 2022 14:42:54 GMT (envelope-from git) Date: Sat, 21 May 2022 14:42:54 GMT Message-Id: <202205211442.24LEgsv9085401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 8cfbeb56aa16 - main - bsdinstall services: Improve mouse configuration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cfbeb56aa160de1ea4f492abeb3aa029e84269f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653144174; 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=3viLWPqXZFlsNDA9TwdVCdYi1p2fUnIRR9/O1xEpgKM=; b=qBfkJ8s5N/S8g9EYaPDh1P0ox6N5by4SszywVyOlg1vCuGUhTFlU9OU+kSZRXAD50eQZNR J50IR6aCJFjaRvGj+d3Siz3x+Cei6bZzBRhjMgOcnR9lOlz3iiYiPNPZl2itwAa/GQUsaq Ccd6SFFKX/wRsL3h2hi0j1L6E3iWAQ5F0xUiIM0nXziJ+zt3NG7oy7mGCGapAbg5klWYvg jvP/o8IeExeJO31+nmDDvKoxd9jBDh3zaT71dM2RSEAq9FZlqIrfSQBHgg+XRGiBpH4AqL 12NP70zPWoCkOwTMjPy8Zdk9sYXGXtyD4kmzcUSrp6lBrldfBz5pYxLYb7SlKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653144174; a=rsa-sha256; cv=none; b=M4wQ4rzKvK+DZeB1/8AYipmVkzxHCeHjuVbSQRH908bLryKn8Xfj6w2kpDkwb5Z96/pW3Z R7fVCJWvl+cN2jb1eRqGT/dw2IHT0C4gY9Q8SUcYhbLqUGWA2t2k2ZCMU0kPIwskAcSvZa oyStcI2h2KT+qBnEsy0ty5ThI8INPEsWjnyttj+i2kULcBEjye3lM9YqzuoQ622+hAPhGC 6mFGQ9vCzXUzyNtl1YK8IJ8oAyju3KaiG0hPDChN/DmT77fZxb7O6DHJqb6bXuEImMdWxN s770EXeVNLh9/LZrSaF3RbJZS+f72DORg67U6/7EOy0noOUPHC09YFEEkVm8zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=8cfbeb56aa160de1ea4f492abeb3aa029e84269f commit 8cfbeb56aa160de1ea4f492abeb3aa029e84269f Author: Alfonso S. Siciliano AuthorDate: 2022-05-21 14:37:53 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-05-21 14:42:23 +0000 bsdinstall services: Improve mouse configuration bsdinstall(8) has an option to enable moused support. However, if it is not selected, moused is still started through the configuration of nondefault devices. So, automatically add the moused_nondefault_enable="NO" setting to rc.conf unless moused support is selected. PR: 227999 Reported by: bcran Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D35193 --- usr.sbin/bsdinstall/scripts/services | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services index f9141a523a31..1ac69fa63b2d 100755 --- a/usr.sbin/bsdinstall/scripts/services +++ b/usr.sbin/bsdinstall/scripts/services @@ -61,11 +61,17 @@ if [ $retval -ne $BSDDIALOG_OK ]; then fi havedump= +havemouse= for daemon in $DAEMONS; do [ "$daemon" = "dumpdev" ] && havedump=1 continue + [ "$daemon" = "moused" ] && havemouse=1 echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services done +if [ ! "$havemouse" ]; then + echo moused_nondefault_enable=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services +fi + echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \ 'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services if [ "$havedump" ]; then