From nobody Sun Sep 06 10:01:22 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 4hd5M63tpnz6qqSF for ; Sun, 06 Sep 2026 10:01:22 +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 4hd5M623Rvz3MLb for ; Sun, 06 Sep 2026 10:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788688882; 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=rNRYWR9Fh15J9qliuvub6SsJx4JS4UW/ywZaJhQiMa8=; b=F57NG+CTeQwoqtsVSodTy1tnGdtjuLLt7XnkSWIQfLbBXshkN0LpK1wuEwuQWTGnHP9spb Vad68/jfTtq5khee8V3g8RpsSqvenimV9JpP5v1QiA1ujDDoTrgDpzty6BBRKCiek8FJgH ez2AVpZRCJSQfZ5sikHQXABTpR862vb/veCG5iIp9s2j5XTzLcCZ/5rkgYYXueZd3d/U19 1eJaC7xxUWGYDRnOcYaRuEaALlzR/0sSYQlhCLRHyA3k+Ro+8cNC8XuCYyA7k+0APvJs7c 4jyW724ZI2s23MqbyyVxgcl8ZMobUer/TqZfpNqz8U9+Vzg8ovtoBNeaCe9xkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788688882; a=rsa-sha256; cv=none; b=AL5RnAWZln50m1JfC7O3YH5fCclUWf+QSg0ZOc8SeUSE9QZOiRHMiy4OnPfuNnmAW/5xAO zf+SNLKeeyPuYDOzZQtbB47DoCo7macBQC7MryWjWp4UB+ph5QkCRLHuwEnlYrSboIr9eN 2sO/lTnchmGsUkSS+1YI2+JUzN7R+kc1i7Uek8BQSKY6oGh6wVQoXZwDQ6p5hFikD+aIXc BOLPVjBkWVWJ4o62u37sTJpXGPWpHF+z1klCIX16IeRwx+bG2dIy/ROR3pZmiio1zha5Sj I5Jc/5xy+IXZOItr9jcXsCuLI0+VtcWhH1+nGb7wgrIVa8ieSLWGYeN17N4hXw== 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=1788688882; 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=rNRYWR9Fh15J9qliuvub6SsJx4JS4UW/ywZaJhQiMa8=; b=ia1ZWOi/A30eQTBNK5THeMkzj22yGi4pPOKbBpdC4W62cv7T6KPerVETybhdzyfExxDvgf g9et/WdXRWmyMs7dW0iE7qos3rEuSq6Lb1T72YjE6+NJ+sPjKvfaVTvCJbzlA9tbo6YgBh 4w5QynHK5lbcIPw1BjZckzLt61mRdhSBi0NjCL9NUMbajVW2LcAgHCz/fswdRLDBM1E9ix wmUwyxzI/msS4koFoocf4MId99TYIi+tTL9jllsqgOB1no4Fm6ejpIhmGVGgmxFa8hIP9q vz4W0bOmGdpURs7fMCg27Ou2aDfsN5G+IUvzYIfGppIEP69XUbpEWXKL/BEflA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hd5M617kgz9lq for ; Sun, 06 Sep 2026 10:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 10:01:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Leidinger Subject: git: 37a4bc181810 - stable/15 - rc.subr: svcj - remove the service jail when the service is not running 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: 37a4bc18181071f5ef72ccd949f8556866f2cbb2 Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 10:01:22 +0000 Message-Id: <6a9d39f2.459ca.7d32fa8a@gitrepo.freebsd.org> The branch stable/15 has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=37a4bc18181071f5ef72ccd949f8556866f2cbb2 commit 37a4bc18181071f5ef72ccd949f8556866f2cbb2 Author: Alexander Leidinger AuthorDate: 2026-08-30 09:44:57 +0000 Commit: Alexander Leidinger CommitDate: 2026-09-06 09:58:45 +0000 rc.subr: svcj - remove the service jail when the service is not running A service whose tracked process had died while another process of its own kept the jail alive, therefore left svcj-${name} behind, and the next start would fail. 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 a70ca1ebd8add7ea99b5674de715ae5fbf389dce) --- libexec/rc/rc.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 0a8acc7ed604..b84d5393bc3f 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1574,6 +1574,10 @@ $command $rc_flags $command_args" stop) if [ -z "$rc_pid" ]; then + if checkyesno ${name}_svcj && + /usr/sbin/jls -j svcj-${name} jid >/dev/null 2>&1; then + $JAIL_CMD -r svcj-${name} 2>/dev/null + fi [ -n "$rc_fast" ] && return 0 _run_rc_notrunning return 1