From nobody Sat Jun 27 13:52:13 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 4gnYrG0wVBz6jbk6 for ; Sat, 27 Jun 2026 13:52:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnYrF2gxPz3RDX for ; Sat, 27 Jun 2026 13:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782568333; 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=FQg92rn/SGgsk9DlGuQX97v47JjiJ+XJVE89mJq65UM=; b=m0QSyJGHog2872J7CkMG8IfhlxnAiQasdsyTHmRsOw5/21thD9dHcedgSCx3+2l+sKhFH+ CS5JVbenKzoifsB2g+q2j/mzDtTdG8Hc11UUC/1G0vTnv/ephOV7bFPzg/r1QfC5X+0dMx McteYWDMx+cWpOmbGRb/HcHLFp9pA8GtVbfWaTyh3+u5z1DnEhV9s0h2MHc+gQ0Uub7FC9 BRKtGGLdMl6pp7XpBiS4cDPKvYeFkGUg3u/arsfzcycaLyKoOnrBrChTBMzbKJFUaIhCR+ Oe9Mh67BRCgsPd/wffoVRaRsViT6BoQN/SqLSzsRMjYunBW/yjDe01K11C+qgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782568333; a=rsa-sha256; cv=none; b=j01AFO7KddY7mii75zJzn5OUzBvdAd2v+KqJ7/WonE8sg91CCpyZE0yz27lQPVQixVwyu3 d+LyrsJVSu636cKTcqQtk05mUAJTNWV0GTXkkaE0cURV2JMNl3AfCqM4wBtCKovK8+5R4r JlvGCs+4KkUx7OWnjif2qOfg3R0+iaEkuI9e0MtPz1b3wtMNcHiUbFl8sBh7OXQkVe8DYe 7Z3EqjOtLW5yYJy0u/DsVW0p6LzgkAXkMPcXXFBW7pA3aujcqdhQjydtxjDqUxN9VTjjiN h0yuA+YEJVmN10LVhdjL1xikTKK2m39hO0LG6H5RCyh72z8o6QJ2IXYqgXgFuQ== 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=1782568333; 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=FQg92rn/SGgsk9DlGuQX97v47JjiJ+XJVE89mJq65UM=; b=cdM3JxMADlBtEQBsMgimPmqMVwK8ekyOSMXU5FH7THIxwUUt+vHtGCWa55WoTDg5iU0NPR VLtJb8nSyR8dQX6MDz8n6UdOi45tT/eS6rUQ34O8+n/UwSAk74GRW3H30ujSAsmnnVn8fY +XkHiF048PuwAFAUB5fkVDvX+bTooMuzXhRLhZ0ai/Na604yCM3CsMWCrtNOEfLuzIBlCx FCFFREpir9mdImGS5lpTlFyABtaoeqKPI1zFAqaBmBKqRLEgmlRRQBmSOxR+x8J/G+Ij7X mpXQ0T2LvUaWhn/UJxBbUPymyoYvEUX3tL8Mb6t7bg2VwZ7DciVmDX7f/ICphA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnYrF1Tq0zB58 for ; Sat, 27 Jun 2026 13:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18eea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 13:52:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: d05d60e958bc - main - rc.d: fix lockd and statd flags processing after scvj 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d05d60e958bca778ea193932facb026c48d7ca0b Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 13:52:13 +0000 Message-Id: <6a3fd58d.18eea.6bee15b@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=d05d60e958bca778ea193932facb026c48d7ca0b commit d05d60e958bca778ea193932facb026c48d7ca0b Author: Alexander Leidinger AuthorDate: 2026-06-27 13:44:33 +0000 Commit: Alexander Leidinger CommitDate: 2026-06-27 13:52:08 +0000 rc.d: fix lockd and statd flags processing after scvj The documented flags are named differently than the script name, this requires special handling of the flags. The Service Jails feature requires the handling of the variable to be differently than it was initially. The change back then did not work, which resulted in the flags to be ignored. This commit fixes the issue in head. This affects 15.0 and 15.1 too. PR: 296233 Reported by: Robert Blayzor Tested by: Robert Blayzor Fixes: f99f0ee14e3af81c2 - rc.d: add a service jails config to all base system services MFC after: 1 month MFC to: 15-stable --- libexec/rc/rc.d/lockd | 3 ++- libexec/rc/rc.d/statd | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/lockd b/libexec/rc/rc.d/lockd index 9c804751031a..ae7515d7bf5f 100755 --- a/libexec/rc/rc.d/lockd +++ b/libexec/rc/rc.d/lockd @@ -29,6 +29,7 @@ lockd_precmd() load_rc_config $name -rc_flags=${rpc_lockd_flags} +: ${lockd_flags:="${rpc_lockd_flags}"} +export lockd_flags run_rc_command $1 diff --git a/libexec/rc/rc.d/statd b/libexec/rc/rc.d/statd index 3f2678af2940..e257200552a2 100755 --- a/libexec/rc/rc.d/statd +++ b/libexec/rc/rc.d/statd @@ -28,6 +28,7 @@ statd_precmd() load_rc_config $name -rc_flags=${rpc_statd_flags} +: ${statd_flags:="${rpc_statd_flags}"} +export statd_flags run_rc_command $1