From nobody Sun Aug 30 17:43:50 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 4hXzxz1mbFz6rBKp for ; Sun, 30 Aug 2026 17:43:51 +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 4hXzxy5rsFz3g0S for ; Sun, 30 Aug 2026 17:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788111830; 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=BwvDg+nH5m6uaqI8SwSJQbATAR8vTUwV0BLg389kn9I=; b=w4CUYjR9+P01zY3rlLt1axcmnmasFa+5HGnu9Y+0R4x7CsG1pUFJkOjikvKEc8Sy05iPGj LTbMKqc9Tf4gNjbWOj8G9b/X4gFl9vrsB7h/vZhzYeg6TnNSTTd5mi29isHur99d4FyrHL YDGRgg+5hYWMjAIC29VNOmImfPfWTuGcbTtXOq3VaCut8figM+yAHkuvaXAOsK8D+EOkBT 2niDsdWX9IdhF7X8/rU3hFKPtp3Oy6ozge4Pk6uVD6f22xJJHhDMspa5qIiz9cqt36/yaj YTEcuQM+joUqdz6O4iXV++NoDwLhzxeVtreE0gtZ+LnRgic3z/Sg9dFseCnnUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788111830; a=rsa-sha256; cv=none; b=AyPfbcDXn4Zte31P4Btx+yMrn1nafaUyurhdPg2rPyzUWcXhFa8gLobZK/CrDVkzpNUwma l+veGt7Oh9tPsUOpKB/1ItAb/BzB21Md6mhTUpqrrj10/1rsSmVDSGnmVlY2Eqi24MMFvA ZyZmpkNSmtEgyJZTPgf5xRuQmYQXq88bgu8boEHQ5jFfrpmseWFtioSSa6ZO4Xmnq2x+ap pKJFlxKekmVeQAkAnkl5uAw4mCZXzp4NnR9A6uDOxFjBlpFA2lQVQ02fqSQqmLpJZ1A+uX cBtE22HHxaiMmHBAsFTmjRVIwsgs5qivFwGydRiEJ+bKMyVppsb9ABrK4jatpQ== 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=1788111830; 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=BwvDg+nH5m6uaqI8SwSJQbATAR8vTUwV0BLg389kn9I=; b=A244ypeN9wM6Y+6GWNwi6Fz3lswwpW+yjebggaiG9PG1FavesjeSnGTMZMOORfCEv6TwZB oRCKb4sEFqruQMIbgoOYSs753tWrO7yLsd3K9fA9gez6s/3/bx0cKJnfRwSiZ4CFzBhyk4 F1K1airprWfahJ7L22xl6YPZzQSQZN/N1tX4bgEizBFmTrNKoq0Umct+ADEl1njqLOgPqL 41mHxIsNF9SgCskvnCJ22vuMg5Us9XqWYVvqFJv27huNIryZsJ9yaJYg3f2vVRsm87zNQf Zg6uGhATK6I3DW3sCo4RdAMqQoMaZgFuDFjkdjxl6IDa+6fYf8/zU6GPxZuPFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXzxy4Z73zbjk for ; Sun, 30 Aug 2026 17:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 17:43:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: a70ca1ebd8ad - main - rc.subr: svcj - remove the service jail when the service is not running 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: a70ca1ebd8add7ea99b5674de715ae5fbf389dce Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 17:43:50 +0000 Message-Id: <6a946bd6.26708.752caa4c@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=a70ca1ebd8add7ea99b5674de715ae5fbf389dce commit a70ca1ebd8add7ea99b5674de715ae5fbf389dce Author: Alexander Leidinger AuthorDate: 2026-08-30 09:44:57 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-30 17:43:06 +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) --- libexec/rc/rc.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 9b72bd5e9c7b..d919e2d25916 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1584,6 +1584,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