From nobody Sun Sep 06 10:01:23 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 4hd5M75Kpdz6qqpn for ; Sun, 06 Sep 2026 10:01:23 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hd5M738f8z3M9W for ; Sun, 06 Sep 2026 10:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788688883; 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=BMxGD7il6l+frdC84u4oqiTUQdhfFd/7m+NzZouS0Uo=; b=jiIitx2YSaCrzNlSdm5Cg3XxJQzgpe2zR/6noZ2WwzQyZ44ZYD7D66fdEN2n3CycacQ46K LzSH3KiUPraPaRGHWlAqMa5Q6EylOpy+6LQir9tZhZ/13AknF3dkZo6WC05D0TS6UUy+MQ AF5iY9izVX0mL3rkUmnJ1Kof5Q7YFq/jIYOySj6K76aCDEsWKnlUfD4tmcRki6Ie6nPN16 Rs+ojEpaCZhNxplvEU/VgQ2cs5dF+yz6olM74c9x3tmTIv3t2ejh4/mRB/xv3iosNFuwjZ 7lbL4f9bVipnZhUZh9EDvlz9lDh/gSh1S5fIHeXIydVGcfjPWegVJlk3+dxgSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788688883; a=rsa-sha256; cv=none; b=s3eDHHK5cbYXQk1hIGHdoKP52NKpPtUIiejBzt+3KNdXI1zDSFQ+GM3IKeMMtMFT8uy7He L6PpTbOlUwhIq9l/ok4wDzMn+pPTbLHVWIuXxTwmBaYar4gypFnFrrFRGvAoJBWAcaVKu8 3ZTtoriwF+8KJTXPtBFwLmobMyy5F9QjQMukVhwslIDR0WHw5qhaLyRxd6BN6tf+1kik6b ycGG0r87ijmii/gv1gR1X3+yCsHwKBUSeo5IV7eIHxuTd5wXer039hVRke3eJ1VzO1HspO Y5HzZCOreQ1nNCAed5HPazmQ+MdSdRJzo77i37EmQ3BvwGjUejEfp1Z/4o0cNw== 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=1788688883; 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=BMxGD7il6l+frdC84u4oqiTUQdhfFd/7m+NzZouS0Uo=; b=xwzt+EsG2r1yLXYCZ3KqzBC3zhE5BPg1JNJ2C+p655VOtbMYNaVB/o8ENtAsOzsfJYEf9t 6rMex4/c1OgyN5goZLi+9waAXVtfdZe6ow4GJUZpln0cwZpxaLxp3gotbIA4Nqc6RGSVV+ KmzOKvm+K2hTLF1yjBnSWWv7U7aS0uloU5PJRDWcoOaFtmRETXTnVQZ/RaognE004OB3eW WV32Hjl+Uet4zwGciwBnASmfuL80/TENGLgNpkcH+/yzGMbJtaKIDKbZp2P7yDbjx/yKwJ k+y01ADXZ3I6GYUM4gfg9oCjppgqoPTM6gTBipZZRHic78UOlJtMdL6roOPp0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hd5M71fS4zBDH for ; Sun, 06 Sep 2026 10:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45d10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 10:01:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Leidinger Subject: git: f74c4cb8a2ed - stable/15 - rc.subr: svcj - run a service's own restart and status methods in its jail 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: f74c4cb8a2eda2c1cc4d3946571e417638447b1a Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 10:01:23 +0000 Message-Id: <6a9d39f3.45d10.4ad0e6cc@gitrepo.freebsd.org> The branch stable/15 has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=f74c4cb8a2eda2c1cc4d3946571e417638447b1a commit f74c4cb8a2eda2c1cc4d3946571e417638447b1a Author: Alexander Leidinger AuthorDate: 2026-08-30 09:44:58 +0000 Commit: Alexander Leidinger CommitDate: 2026-09-06 09:58:46 +0000 rc.subr: svcj - run a service's own restart and status methods in its jail A script that defines non-default restart_cmd or status_cmd should execute them in the service jail. Where there is no jail to enter, restart starts the service instead of failing. Fixes: 2efbd480f1d3 rc: add service jails framework MFC after: 1 week MFC to: stable/15 Assisted-by: Claude Code (Opus 5) (cherry picked from commit 327dae5081059eb97af0cf319a444b3937ff4db2) --- libexec/rc/rc.subr | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index b84d5393bc3f..5bcd104a9cd1 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1419,7 +1419,23 @@ run_rc_command() _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; - restart|status) ;; # no special case needed for svcj or handled somewhere else + restart) + if [ "${_rc_svcj}" = jailing ]; then + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 + elif /usr/sbin/jls -j svcj-${name} jid >/dev/null 2>&1; then + $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${rc_service##*/} ${_rc_prefix}restart $rc_extra_args || _return=1 + else + # nothing to restart, so start it + ( run_rc_command ${_rc_prefix}start $rc_extra_args ) || _return=1 + fi + ;; + status) + if [ "${_rc_svcj}" != jailing ]; then + $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${rc_service##*/} ${_rc_prefix}status $rc_extra_args || _return=1 + else + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 + fi + ;; *) eval _rc_svcj_extra_cmd=\$${name}_${rc_arg}_svcj_enable : ${_rc_svcj_extra_cmd:=NO}