From nobody Thu May 28 14:07:00 2026 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 4gR7bF6JBLz6fn09 for ; Thu, 28 May 2026 14:07:05 +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 4gR7bF409Wz3d3T for ; Thu, 28 May 2026 14:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779977225; 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=49dmHzPFfrBtQC1OfrZhJ3NCGiJEhH5ZbLM+8d1Ju+c=; b=Z9XpoFzY2L7kYr2de+gOTc0w03skUzwFOd2LsX0DD0z3oIGoXaSqNTZi0nUKX+ZNWqAf/1 u40EQ2sC8KzELrTklEq4ht2coduqv+sxyElB23HNwnqjbKcl23ml/9GsWhkyVssiMU1o6e DR7D/3LbGb5//oZtMi7Uw3mo6TfNb0ukD2+FIK/r8HZXaJjIh+MAjArNL6tvgusMk1M0tK SyDCIxO9nZ8rROrOSA+E4Z824WsPWWLNydYrUhjKTElT2Z+oCkVwFzZfyDzdK27/IJRMx/ f1ZOdD4T6tDNEPonvHQFLq2Ct2Yq0132mN6ef/CWYo3+p8eGaSttatS7HLI6YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779977225; a=rsa-sha256; cv=none; b=G1rNzaNZRigy19PgPXre6Xp2E18UNBz+lwkngFhhEB0XsQnXMzwUkp+ZFWG0uhyoo/yntR iADYJzqcP61KLyessgvOa8xc0CcQGF85koNlSc1lnJzjiYrZt1O0k2ywJ1wsmpAW/aoA76 bbit4plYm5rUXn/JLC3YJE9G5eihjgTOsqPl3fZNRt13KRya+Fl9zXz8Wk9wvEksolGagr Zz9ja/u0LDzKNBsYKA6nG1JJq3HmILsvw6C4JDNA+9CIFejAf1+Ldv7xC4bQdYzaBj8Zw0 uO4XtL2nQhdaZ7aYx41xek/H7ZKpW58BNwp8D8riFSZW/rWB3cxPSr2FsQFQhQ== 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=1779977225; 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=49dmHzPFfrBtQC1OfrZhJ3NCGiJEhH5ZbLM+8d1Ju+c=; b=befuHOMaB2FvxtnkhpSPJGuJyxWr2xMSP7Z/pmCO67BIv8OF0ceteXwIjke+/hMiN4l23D EMMnJuJW86sA2xmbNm0nWDQ/kUvWQZVXJrHfPPY0tNLl7e23REYe/tYjK2QFGKckX0kxgC n5VreKpIxMPIQmcUjindBLzbPNQKBTOGuzf4UjZqXuN4nFzInvt/fhM62Z/X20Sd0/VBp9 lWLELLsE7RAxl1ngKuiCNyqx/cdWaZrm/JzXi8OwtKPK/24pgtLsCpIwE76A/j0cAeUyK3 XXjpdPTj3eV50jLcreFUr1XXYGRYpSjDsdfg8Y426pN7bqCUjJjVd+Wyo1C6oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR7bF31nhzpt9 for ; Thu, 28 May 2026 14:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c80 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 14:07:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a576e5140ef3 - main - rc: virtual_oss: Define some variables in rc.conf 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 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/main X-Git-Reftype: branch X-Git-Commit: a576e5140ef352af6cf227528d1bfc6b964516c8 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 14:07:00 +0000 Message-Id: <6a184c04.20c80.27c0e61a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a576e5140ef352af6cf227528d1bfc6b964516c8 commit a576e5140ef352af6cf227528d1bfc6b964516c8 Author: Christos Margiolis AuthorDate: 2026-05-21 11:38:22 +0000 Commit: Christos Margiolis CommitDate: 2026-05-28 14:06:06 +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 --- 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 75420e42cdeb..27e8c8456b6f 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -736,7 +736,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}"}"