From nobody Mon Jul 27 09:39:33 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 4h7tps6wwRz6mhr1 for ; Mon, 27 Jul 2026 09:39:33 +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 4h7tps3nFsz4Q9m for ; Mon, 27 Jul 2026 09:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785145173; 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=Rti6PIPRk0XcHKyNGi84YdKCK/zIEkoN/G1LcplM3Q0=; b=CiqUi/KfKniaHQohll9bbAHTwaGk6X7rgkw6nKuKPdLh/a5H8ifM4icYMXayUX1yx/7wI5 Cs6DDi/rKxEAZEPD69iAs+mn15rTpy2sjWZfQLA7DfzZt5WAojWBGUOas28UVnVIQxVyne acS+QXbsqNrfKG5fk7aMiaR5ol/PErN9DO0rsqyzJcoMdR5NAY93zhFfAXdH4dByiZtil3 Yw5XFh5aKzoV+XCAIcW2zZ4D2E9T1X5+X3hdyajdKOuaN8Wko+JmpjNWDcoigFoJsRdzfQ 1nsAOGVJsAin6fqnkN8PT3M6DEwTPVpjfpEuUetEeWpyUZiMwjwICBvPxlMocw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785145173; a=rsa-sha256; cv=none; b=F6h/HFVVsadBQr1t+fC/zIx6gYTgSa3qzI2mUVnkNMA28DFlzKK3SXpaaqmSI4i8om4V7S t99oZr6pxy6G7fPQzR9kAEmnGxqkxC44GEb3T3DcO5lmTioJOHejhhYHfqF1opcZitB3g4 skKNyDv1TeibRAsBKAJfghd5HbcYSFNxM/RpPlsvAiL8Z/KCAz0SQ4/WWxtNP3qizm6eQ7 5Uf+chzn4NZZjk6PhjnqFvkAWsgdVbmgTXzK7Jcy5xTLVOuT32V8yrI5ioQrSHBjpmls1M aGyZRyVH51emzuFGReEtCd6WVd7fO+SqNV7lZVv9EWL5WflUIWdQ/5Yt2GZhYw== 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=1785145173; 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=Rti6PIPRk0XcHKyNGi84YdKCK/zIEkoN/G1LcplM3Q0=; b=hi8Q0JRib3AoAsBrvGa5T71whnDD2ZXseN4iUCjF2zqPL2RzNztFKacnpIGC/5xD/5bArU oUdKdhF3Z7kRueO7rstr2FXjarLq8UZPaAP2rPzwd3qMMYJ/ZWkV5zswjld+QtQnLsz3Eq QZl2K7L+vKQTKmsiVzYE6BZ8cfxnwOMeKgDMey/tVyb+0JNF+N7IbnB5+cICMpo1WeVqwd HKX318CM0Bi/Al4/r4eJ1aZcvBeT8zbS+Wyp9Uj5yKiaFm3eH4wAJuhmO5easA5nIm3CAn hiuXQUUdIGS7fSOh3W4yc14szmmBg8M71gK5MyzLXTp1NT6DhsNlwtIxDSWwEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7tps2d0xz13GN for ; Mon, 27 Jul 2026 09:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 192bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 09:39:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Leidinger Subject: git: d85e97c16f03 - stable/15 - rc.d: fix lockd and statd flags processing after scvj 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d85e97c16f0340df686acdb3b71f4eaf1049ab98 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 09:39:33 +0000 Message-Id: <6a672755.192bb.6b488783@gitrepo.freebsd.org> The branch stable/15 has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=d85e97c16f0340df686acdb3b71f4eaf1049ab98 commit d85e97c16f0340df686acdb3b71f4eaf1049ab98 Author: Alexander Leidinger AuthorDate: 2026-06-27 13:44:33 +0000 Commit: Alexander Leidinger CommitDate: 2026-07-27 09:39:27 +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 (cherry picked from commit d05d60e958bca778ea193932facb026c48d7ca0b) --- 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