From nobody Sun Jun 28 18:40:12 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 4gpJB96lH7z6jkYM for ; Sun, 28 Jun 2026 18:40:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJB9494kz3XcS for ; Sun, 28 Jun 2026 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672017; 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=5nLQnrUG9o/4tqqDtkE+L+ir6SrbiZa8LCrpXKOprAE=; b=R0DJsZx0eXy6yHcaqLswjVgWI3L6/DZO2VHVUqqiAD1haTGdGo1lkTeG0daZnXVitWbi1Q gAC+7fClvAW1VKig/+7l/5OkIH4teIJ6HzWE93ZfAdYH/y1+OzKL0O9UVZ/er07oes5ecX GODwXaCnpNdvCZF7mD3lMBDMU1YkMQFfPJNYS2lRJQM1mIykPLUpkKCLR1dJqKgBfSwMYv ahQiNS9LmvKBHO11SasDvdEhnB+BhjmV1T617pVehKOn5D+HXK/fLh1fSfO/uSzlFFh29M XYERqTTqfaRWDoe2gC1n1iY2XRx/SKYL9KC/Xhyx+DVkFiVR7GRG7/y7pVZERw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672017; a=rsa-sha256; cv=none; b=FJHgkpH7GJ79ldMwusTG41rPei9M6MvF5XNMgzCdqxb8QjrFXpBJsfmXhyM0t5BlKvY0+U mfSgNpYcsOGP2J5uTdx0C+aVfdF4aHuqgMO3PIPjeLKkA6ND7FerlzqeFWj22MRbMZ5goG x/hg2nh2+g+3vqLe6cVgmKe2y9XkwglTTpZaAOmF423MeXQP6RiJDSucfCL6yIDuppALfq wNVqNwashwEEm3LatsO5z4m3ivOlhGvpu8WCJWq5655kUaCGAnMpmeR5BHPYP8o3p+trqb c8TQ9cuI/g29Kd+A5s9Zk+TOhrUkembqtzczQdaseFaYzAdy1i7lbEzVWv6M6w== 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=1782672017; 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=5nLQnrUG9o/4tqqDtkE+L+ir6SrbiZa8LCrpXKOprAE=; b=e6FDbf456ZHfr2wwwStmBTndbdsF+SokPhvscFsqgml6kSM2p1lhwrsCVSULKJ3pGwSzuU DESUBRW7CWByETkcxE9xznS5u5Wf60JPF/X35ltxWZR3WdaXUNu+Xuc9ogxAe3W1lyFso3 DYOQZ/o9w+qO8aiSUmRVOASRJQlQX3/RTuGjthCgmtthUE4xTbildAAVDgzp7m+ZEW/KMC WeABtdWHYfaYo7GoxGW4NWvo+9YY8zZC+jlEyjNP6Ey6Xf8yG3hB5o6BsaMDZyn4llCIw7 ybqf85POq75LNqxAoladlgHyDwI2v+zX/Li5v55JCXVMwKhA7XMdNhOJZc9pzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJB91ZMTz6T0 for ; Sun, 28 Jun 2026 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bcd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bc3e0c6afdb9 - stable/15 - init: allow to specify a custom path for rc(8) 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bc3e0c6afdb9adbe49f2efe8739580782bf6244b Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:12 +0000 Message-Id: <6a416a8c.1bcd6.421ed633@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3e0c6afdb9adbe49f2efe8739580782bf6244b commit bc3e0c6afdb9adbe49f2efe8739580782bf6244b Author: Baptiste Daroussin AuthorDate: 2026-05-05 12:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:23 +0000 init: allow to specify a custom path for rc(8) This is useful for testing alternative service managers without modifying /etc/rc MFC After: 1 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56828 (cherry picked from commit 9f2ad7c09709e01ff6b856df0315e91ddc20df32) --- sbin/init/init.8 | 10 +++++++++- sbin/init/init.c | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 85b1db2ddf06..f562efde0b51 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 22, 2021 +.Dd May 5, 2026 .Dt INIT 8 .Os .Sh NAME @@ -396,6 +396,14 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.It Va init_rc +If set to a valid file name in the root file system, +overrides the default path to +.Xr rc 8 +.Pq Pa /etc/rc . +This is useful for testing alternative service managers +without modifying the default +.Pa /etc/rc . .It Va init_path Specifies the path used to search for the init binary. More than one binary can be listed in the string, diff --git a/sbin/init/init.c b/sbin/init/init.c index d28501053c7f..db680c7f73bd 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1025,11 +1025,23 @@ static state_func_t runcom(void) { state_func_t next_transition; + char runcom_path[PATH_MAX]; + const char *rc_script; - BOOTTRACE("/etc/rc starting..."); - if ((next_transition = run_script(_PATH_RUNCOM)) != NULL) + /* + * Allow overriding /etc/rc via the init_rc kenv variable. + * This is useful for testing alternative service managers + * without modifying /etc/rc. + */ + if (kenv(KENV_GET, "init_rc", runcom_path, sizeof(runcom_path)) > 0) + rc_script = runcom_path; + else + rc_script = _PATH_RUNCOM; + + BOOTTRACE("%s starting...", rc_script); + if ((next_transition = run_script(rc_script)) != NULL) return next_transition; - BOOTTRACE("/etc/rc finished"); + BOOTTRACE("%s finished", rc_script); runcom_mode = AUTOBOOT; /* the default */ return (state_func_t) read_ttys;