From nobody Sun Jun 7 21:19:39 2026 X-Original-To: dev-commits-src-branches@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 4gYSjl4hXMz6g6qY for ; Sun, 07 Jun 2026 21:19:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYSjl42PWz3b8j for ; Sun, 07 Jun 2026 21:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780867179; 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=YyKsMGBBnyLIeGKxSBRgcfdn8Zt+UgdB4xhf7CthOxM=; b=FOgUyzPOF/ku6/fonuU8Z5LDFpq/ODt9+UHLsvfVyyRD+tmBKBCZ/WZB6hobZlGbudf12b OM2cPZmnDK/MgIMpOF9TQ7vzzsrq/xfpVJhADyLO45aTtG+jcrcK0vdn4JaeWZGqaXwK/p XKZ8nhQtqYMDwRSTg90scG6nUllWEAMCDMcUPuyBXG3xCmKwpphVbJwqp8S52BiKEwaUtJ bHQxL/MkBOcpxKgU/myDvxVIWsSNJDVrmhro61wb57e44JQ4p1KQI7NHp+irTceiR3CVfV 6KCp9q0KFB3MrVtVVULQ5BbYcJZsQr6RmbX9F4Cd0pB7WWp8oXJMYoFx2hb39w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780867179; a=rsa-sha256; cv=none; b=S//9guXNsiLLQJNLjTzep7ZqeXhrtrzAxPNxdcGYpOW7HyGO2qhdwQLFFRVdTF3AJ+bK4H P3iEffE1KDzc3NySJ/ka0pAWt/LPbpKMfDIQB40Qz4AfnOB/b5KGT9PK4+PoXUzkAGaNIl pGmxKr1ZwD2oqufr0jRwFBm34Hk/JCadcgOFFfj+BfqrQEsGV2mMG0FMYfScZ/sMznQfoh BmiSGFxw+oCScPLLPsFn8tE1/z9REcSnzJbuF8YDdI3TNRynqneYRBgHnx4g1a/3adf7XN 8pZ6GiA9sKq7pHXHcpHLHKLWhv2AWp8+d5BMHxIlnDx490HWS+vDDlOP+LV2xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780867179; 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=YyKsMGBBnyLIeGKxSBRgcfdn8Zt+UgdB4xhf7CthOxM=; b=a6ki4p3JsMyOHnloMwFL27rF4AR08hNLD8SGhLCfw/M0wlFkxww8a0l1ISm2ChcGxNxD/d qZTJ4JZJQSZfSzJA0lYAfv0RBGlMks+oDOCEFu4zDUSmfxuyH96XiLJvM5PNDi88MXTdhD N2XlUN123JKlR6nlhR4C5VUcRipRN3Hhn+3KPAjjIhG/fpLCE+bBuIQWLt0PrUmlFarB5P v0tQZv87fPiorfDb9miZpXLKjqzi0b8Jz4oRnSgYx60pn73ru0DHDlf6Vsp3Q75BAu2xlB Z4QXn56Hwl1Y52a/pNWz5HbU+CwTwTKC5eOS1HDcjx0Zbv7nvas2gqZw2CJauQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYSjl3cvfz3q8 for ; Sun, 07 Jun 2026 21:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Jun 2026 21:19:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4910c5a7d518 - stable/15 - rc: virtual_oss: Define some variables in rc.conf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4910c5a7d518411ba39a9228316cc572f3857a7c Auto-Submitted: auto-generated Date: Sun, 07 Jun 2026 21:19:39 +0000 Message-Id: <6a25e06b.479c6.6e99d951@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4910c5a7d518411ba39a9228316cc572f3857a7c commit 4910c5a7d518411ba39a9228316cc572f3857a7c Author: Christos Margiolis AuthorDate: 2026-05-21 11:38:22 +0000 Commit: Christos Margiolis CommitDate: 2026-06-07 21:19:34 +0000 rc: virtual_oss: Define some variables in rc.conf They will now be part of /etc/defaults/rc.conf and be accessible by sysrc(8). Fixes: 70e27ecba518 ("virtual_oss: Introduce virtual_oss_default_control_device rc variable") PR: 295560 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: 0mp, jrm Pull-Reqeust: https://ron-dev.freebsd.org/FreeBSD/src/pulls/33 (cherry picked from commit a576e5140ef352af6cf227528d1bfc6b964516c8) --- libexec/rc/rc.conf | 6 +++++- libexec/rc/rc.d/virtual_oss | 12 +----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index d497d7009a15..fdf6a24db119 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -733,7 +733,11 @@ newsyslog_flags="-CN" # Newsyslog flags to create marked files mixer_enable="YES" # Run the sound mixer. opensm_enable="NO" # Opensm(8) for infiniband devices defaults to off nuageinit_enable="NO" # Run nuageinit at startup -virtual_oss_enable="NO" # Run virtual_oss at startup + +virtual_oss_enable="NO" # Run virtual_oss at startup. +virtual_oss_configs="dsp" # List of configurations. +virtual_oss_default_control_device="vdsp.ctl" # Default configuration's + # control device. # rctl(8) requires kernel options RACCT and RCTL rctl_enable="YES" # Load rctl(8) rules on boot diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index 73a486f547a5..07f81aeed4bc 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -22,13 +22,9 @@ status_cmd="${name}_status" required_modules="cuse" -configs= pidpath="/var/run/${name}" -default_unit=$(sysctl -n hw.snd.default_unit 2> /dev/null) - -# Default configuration's control device. -: "${virtual_oss_default_control_device:="vdsp.ctl"}" +default_unit=$(sysctl -n hw.snd.default_unit 2> /dev/null) virtual_oss_default_args="\ -S \ -C 2 \ @@ -42,12 +38,6 @@ virtual_oss_default_args="\ -l dsp.loop \ -t ${virtual_oss_default_control_device}" -# Set to NO by default. Set it to "YES" to enable virtual_oss. -: "${virtual_oss_enable:="NO"}" - -# List of configurations to use. Default is "dsp". -: "${virtual_oss_configs:="dsp"}" - # Default (dsp) virtual_oss config. : "${virtual_oss_dsp:="${virtual_oss_default_args}"}"