From nobody Sun Aug 30 17:43:49 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 4hXzxx6NtYz6rBsn for ; Sun, 30 Aug 2026 17:43:49 +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 4hXzxx5Fvjz3g0R for ; Sun, 30 Aug 2026 17:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788111829; 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=K4DStfxyFRqWv51yAp2OnBMXYCUzfWMC/Jfd8HV9F1g=; b=d45VcKHzolUD3pA1FyWr50zqAGd22fdc9QX6/wXyuxmL1u5KixDIGRwRnLJycr3V7FmwiU mrb0IbGUHxMi1Dp4g6sBZgW9DcrsjbbiJA60TTKKJtVhCU50xzb1mL32NVOXEoG6SqTzTl 0BK7+WjqCtjKz8s0+C6Xwnm3PNa6uwyW973aEwl+A60bbh/Ax+zJHx7r/dA8pPhNfgEWBk gvGKI/lDbZA67DXvsmlPqDtJsX6nuVU6I9KRLDusJqtV7HjxbEdxPgAhnWX3YHqYt2gTwT L8Kh/d4WlIMuBiPUqh3EpPzbJttrxkvQ/IMHuiuFjvwfyj9TZqpKED5co8W/SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788111829; a=rsa-sha256; cv=none; b=JpKT7Jmjsi/1HZj8aTh2Fb9ZC+O4hW5Z7z+lRhQwOiR+GExAEPsFrYTMdQaBHkhgKuo/m+ V7CpGFfWve/htKeyEbL0MoB0SrSmtsuNxLCHm3bWbd7mlfWnWP1jXspXir6voD78F2kslI A275DLbtVBn7Bd9SmAdUP0nIe8qeX1uUKdn+6ijCIORrFCt3euh3FoAHEcaYeBgY65NOyL 9C6cm0r6fUA/XwUa4tcvjBAhLFHcwYoHRJRcQIv1hisLP4iWbK0KKOv2lL4bey/sB2tYvR aQGADT32aDZ8GBKevSR42Q+VP6OeXaLjPZcP2mwsLeKhp7GuLl2dJR6n0Efn0A== 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=1788111829; 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=K4DStfxyFRqWv51yAp2OnBMXYCUzfWMC/Jfd8HV9F1g=; b=FIRxjXZnh4ckeuo8vyR/0c0pttDvst0kZope2f3JBGM7T/TW4SpWfKvDvyKj5GmUBh1IjS 2D7WpiedI85DjblXkuw37w/QdUMSeaIcjhw1bRZjUMuMgjltgl5t/b5MOnzKT+kDlTxQwB Xor1mHGDKO+bWSGJ6vDLK/tL89nE4n/PaHVxP5YX7/y1vrcVfcrLQXomJxjCNnu+ANhf7T hKnWhO2mo+n9NIJ0V+lUyyNhvDsgYibDw4q5Bu4/XkBHXUsRgLLEbxpzO0O8qoKp1a0CPq qsLn4jO39h/YSc7eGbO0pnSLburedJuA3un2w4ENwNyTJrJA4DFdd3qSaVfYEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXzxx3dsGzcDx for ; Sun, 30 Aug 2026 17:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 17:43:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 21e53eeaffca - main - rc.subr: svcj - let svcj_all_enable enable service jails 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: 21e53eeaffcac0be3427b7edb3b8739344a65174 Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 17:43:49 +0000 Message-Id: <6a946bd5.26c96.6ef04a45@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=21e53eeaffcac0be3427b7edb3b8739344a65174 commit 21e53eeaffcac0be3427b7edb3b8739344a65174 Author: Alexander Leidinger AuthorDate: 2026-08-30 09:44:55 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-30 17:42:55 +0000 rc.subr: svcj - let svcj_all_enable enable service jails Fix the logic for svcj_all_enable. Fixes: 2efbd480f1d3 rc: add service jails framework MFC after: 1 week MFC to: stable/15 --- libexec/rc/rc.conf | 2 ++ libexec/rc/rc.subr | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index e7ce22822515..41820cd26330 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -766,6 +766,8 @@ jail_confwarn="YES" # Prevent warning about obsolete per-jail configuration jail_parallel_start="NO" # Start jails in the background jail_list="" # Space separated list of names of jails jail_reverse_stop="NO" # Stop jails in reverse order +svcj_all_enable="NO" # Run all services in a service jail unless + # they are explicitly excluded ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 061611709628..9b72bd5e9c7b 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1172,8 +1172,9 @@ run_rc_command() if [ -z "$_svcj" ]; then _svcj=${svcj_all_enable} if [ -z "$_svcj" ]; then - eval ${name}_svcj=NO + _svcj=NO fi + eval ${name}_svcj=$_svcj fi # setup pid check command