From nobody Sun Aug 30 17:43:51 2026 X-Original-To: dev-commits-src-main@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 4hXzy01qYCz6rBpK for ; Sun, 30 Aug 2026 17:43:52 +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 4hXzxz6q18z3g5N for ; Sun, 30 Aug 2026 17:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788111832; 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=NeSVKHEq5XRmvL6s6X35XUE8rrw/N62rjTbXFqV+ICw=; b=w39yBz56vBXIKv3o+a6dFc2ZRANKboHaz50dlMvgyjgsSr/RN7G/rPoQATOhrqrdw7clYx bXZMP7UfVwZ3TYKcqRuyNB/g24qiR4kM+zQzVs38TaDAhUu/EPKSwfbz9vivvM//kqpVMa 9uqT81aNV0Hv6xZveGX5+Zea3aZMKwK3NOMvp82Q2qV6qbDkJFDhdPJMZwvPXe41N7xZLm Z8XwSYdeBYHalQFbWpiYpU/RiqfZlcbd/BNraXD2l5743fzGE9vmsdOO2jEIAkKiwe48jR hh2pQUUTVoUXVS57IqLb8/seXeTJjAS+0nw5aVExhNd8oKAyadu/swCsMYuTdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788111832; a=rsa-sha256; cv=none; b=h5u0TUFXAAZ/FB3A7Bg9gd529dXTM19UuuVlexOThV9E4wM8Gus2Y+JP+CSyMBqyzi4qKl hZPJmKNt2qFCmq/CmMg5FjuwTBj8xqCVe4depH7DHhv20jsu3OaE5rn8vnuNyLz8hMen0+ 9wzECRkcMw5JzzIaC9bNQdxiIOuKyvM2NdsBGzwohWu+Wwt6af37bQHrVxiOdbe6tgJVuo 7AiI1l3vgwCfpFf6DDG6nRY+TadcKVJDXwXqT5i1gMk8sMe9gUNn4MR2XFvVXed7+hXKgv /VUw2kTRob+rHDPQrT8b2OlNVUouVWEpWgrZdYKAifG2x9/tyh8+yIb8ibMBZg== 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=1788111832; 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=NeSVKHEq5XRmvL6s6X35XUE8rrw/N62rjTbXFqV+ICw=; b=W5enbUXgv8MZD92CEm9JjcCXF4oQNOUaUpGl2ikGUz5v3R5jMKijM5TPbWnp+Q7m2Zb3P0 ktaqvjDaqudasbmjzFPdHwo7xOvGxs8uU2uCbtGaWzJ9PBvCrvu+V5xL6Zi4q8QD0mRPQi /UOR0bpORPpdgrmbnfZxXHfjT6CV0CZElahm9BCgJT0aQR5G4duidi7XCjk5eR1tsyeqXB S2PptuZI9WWB0VGHepPBS+Q+vz/rWWNLGvhvH5x81H7pM6+BzA/coOjHurdJaAlrsGAapB +gTqAiZ/QPlJabDI5Y21E9OFcuwYsQe4joMNccPA6EWhT8MvtRKn8bdMPnD0Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXzxz5Q8SzcF1 for ; Sun, 30 Aug 2026 17:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 17:43:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 327dae508105 - main - rc.subr: svcj - run a service's own restart and status methods in its jail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 327dae5081059eb97af0cf319a444b3937ff4db2 Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 17:43:51 +0000 Message-Id: <6a946bd7.264a6.6147a50c@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=327dae5081059eb97af0cf319a444b3937ff4db2 commit 327dae5081059eb97af0cf319a444b3937ff4db2 Author: Alexander Leidinger AuthorDate: 2026-08-30 09:44:58 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-30 17:43:11 +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) --- 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 d919e2d25916..68d5ab308d0a 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1429,7 +1429,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}