From nobody Sat Aug 22 10:43:26 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 4hRv0b0ygRz6pg9x for ; Sat, 22 Aug 2026 10:43:27 +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 4hRv0b0G6Bz3QFT for ; Sat, 22 Aug 2026 10:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787395407; 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=QL2wCvKq0JLXNTBi7gwX9ZmncswIODZYb7MOA9Mo4uQ=; b=xD3tUV5wquhSemztucHCl6AR03hJAR0WPPHvO81mgNEMJoI4xYOBP32pH4Z+4CnGrVEoP4 JUgRQDMiH1xF7X3j6kf+qWgUL+IYsBSp/XUa35/YruuD5FW64oO7KY0qK07G+iNmxHL4en XYthktNJVm3cWS+KQGG8YISD0nYQ0UZKKzmBXtxTWYy7TZkpejh8/LxnpC00BVpM2A+TmO EeS1I6LA6I9s+5ITOD9cShyPi+ZuGDcNOw97ap1vSe2ns3bmH841F9HihvbiVXAjhrQ/mR 0YTc1GBdOJouKLmTWogkop6LlW1K6D63gQTFTVeBHP2eA5BjQJrPkh/J3sD2zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787395407; a=rsa-sha256; cv=none; b=I3IqWAbiF0nzpaYdYAHjlUT54tIpIaJPmdxzn/hOweqJf1o1Zan60OLfYAQKCxewM064Ep pfZWVRTm4eJIGcVcSPLTON7iL9P6/7xYF3Us9ERPsyGjx1X95GSvzJCIKEtl6YVGzWTZS0 h7CBl06LE7hfNX/pRi/4rksMgLKjMv6sA4c2lV87bv9HESoyzR64d2EbLUBGH5c9R020E7 35qZm3ayJyw4MAMKsB3QLQXM0EpOqlj4wZzSx5a+FspDEM8knTn/R8qt6ft6Jo8MqInyZU 9vf71OrzVvynyeB6nk9xJgNm0KIMiUR1yKwceNnXLbv+OTbxituNk2U/tCwWNQ== 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=1787395407; 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=QL2wCvKq0JLXNTBi7gwX9ZmncswIODZYb7MOA9Mo4uQ=; b=lXln22IFBlNmWyaY1T45PFERZQfTqqJdoX7Us+OGSUwIQkTZmCsmQ+1cSL03bNJdXppuwr 8HF3p4ViBGOALoN5gWlOPeqygc6pioD29DAec4Tqjvfxa0dcU/RPHvJfJYa61gn/FNxved 5G1xP1o6Rdp6ihgLsvsdIBKyXolkTbxQB5tW9Ij2pMFhlKnyKFH9j+gYvzgjUu99TvQ2ak /1z4Ij+/0RKSgodbuliirnqihStvFX4sKvGu7GERUZJU0EWk7UFyjxNtJ8VAS6e+2oD5HJ QgEmL9/evvHIkC+osWAv4vLhPLcLU7aWt3tl2bCboWBINkKEXtNKWKmieice9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRv0Z6HqRzm7Q for ; Sat, 22 Aug 2026 10:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d64c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 10:43:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Leidinger Subject: git: 0bee17af48dd - stable/15 - etc/rc.subr: svcj - use the filename for services 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: 0bee17af48ddd09ff3fa83e6e3b537b89d131bb0 Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 10:43:26 +0000 Message-Id: <6a897d4e.1d64c.6c054fa1@gitrepo.freebsd.org> The branch stable/15 has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=0bee17af48ddd09ff3fa83e6e3b537b89d131bb0 commit 0bee17af48ddd09ff3fa83e6e3b537b89d131bb0 Author: Alexander Leidinger AuthorDate: 2026-08-14 07:49:35 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-22 10:43:01 +0000 etc/rc.subr: svcj - use the filename for services We have ports and basesystem services, where the internal name and the filename differ. While the documentation recommends to keep them in sync, the reality is different. For service jails use the basename of the service filename. Fixes: 2efbd48 rc: add service jails framework Suggested by: joneum MFC after: 1 week MFC to: stable/15 (cherry picked from commit d0f0a3b89b932b776b76278fa6885f19e8b30cbb) --- libexec/rc/rc.subr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 0c5d616f2c07..2a5e835d3ca6 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1401,8 +1401,8 @@ run_rc_command() fi if [ ${_do_jailing} -eq 1 ]; then $JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options \ - exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \ - exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \ + exec.start="${SERVICE} -E _rc_svcj=jailing ${rc_service##*/} ${_rc_prefix}start $rc_extra_args" \ + exec.stop="${SERVICE} -E _rc_svcj=jailing ${rc_service##*/} ${_rc_prefix}stop $rc_extra_args" \ exec.consolelog="/var/log/svcj_${name}_console.log" \ name=svcj-${name} && _return=0 fi @@ -1412,7 +1412,7 @@ run_rc_command() ;; stop) if [ "${_rc_svcj}" != jailing ]; then - $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}stop $rc_extra_args || _return=1 + $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${rc_service##*/} ${_rc_prefix}stop $rc_extra_args || _return=1 $JAIL_CMD -r svcj-${name} 2>/dev/null else _run_rc_doit "$_cmd $rc_extra_args" || _return=1 @@ -1423,7 +1423,7 @@ run_rc_command() eval _rc_svcj_extra_cmd=\$${name}_${rc_arg}_svcj_enable : ${_rc_svcj_extra_cmd:=NO} if checkyesno _rc_svcj_extra_cmd && [ "${_rc_svcj}" != jailing ]; then - $SERVICE -v -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}${rc_arg} $rc_extra_args || _return=1 + $SERVICE -v -E _rc_svcj=jailing -j svcj-${name} ${rc_service##*/} ${_rc_prefix}${rc_arg} $rc_extra_args || _return=1 else _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi @@ -1503,8 +1503,8 @@ run_rc_command() fi fi $JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options\ - exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \ - exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \ + exec.start="${SERVICE} -E _rc_svcj=jailing ${rc_service##*/} ${_rc_prefix}start $rc_extra_args" \ + exec.stop="${SERVICE} -E _rc_svcj=jailing ${rc_service##*/} ${_rc_prefix}stop $rc_extra_args" \ exec.consolelog="/var/log/svcj_${name}_console.log" \ name=svcj-${name} || return 1 fi