From nobody Tue May 5 13:41:05 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 4g905t20bvz6c7GQ for ; Tue, 05 May 2026 13:41:06 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g905t00qlz3MPs for ; Tue, 05 May 2026 13:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777988466; 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=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=gwLnLwKX6LSpss/xq/ZKE/ymXDItTijtWBXQyfklHt46cQRher7XfxYic73PMV+J5gG67y d0XHmuBULZ5pepoIxoEHE4cYfwuVCfCPo/XQVnXLXXOxFAzmeriidJ29bK1VtifNDRVC3Q /zwHhdA1UwHUC5+YA4oQV62hZjjzvkk03TszyaKbZlEA3MA6Df+/Q6y10MHHGArhn6sZ7n qg72tPCLqiR6rpw5E/LHlwlAyybMdZst8pRovBDY9VnvpeJk6XKJsE7cMzm8YhhFhf5FJv JXaDvYYQXlOISI73UD0Kfmn1uNkL7u3rg/Yjfv+aLUYLFYbhNgqpGGojm3MvZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777988466; a=rsa-sha256; cv=none; b=VT8F50AXgMpSe0M9s0CnvRzcN40AgjFzaf98oG8qo1NPkwsqcZdN+8P356LCVF8uJAkFhC kOh6BhXyeYaSnhLvSfSQp4j6+ifVEeJwuLVD44m9BbECY8kndc4TowUJuHA/CPeUE/dNH3 EwmroVYcyM8FaVwAvim+CFTTz+dZNf9s8nxPBI7QLqf+OOM/1ugdrJDlX3M3a40fpc3WNf cmreoowFnGKuul4/M6z6wap/3yOIa9VS+zrIXZg5asT5zXVT7X3lRvsihdKxqIEibwwrBX 5Utu+fu0vnPv0PPZN6DUM6sLP5/ysNffYfbPwB3cksnKVyt/VFV43oZAgw5wiQ== 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=1777988466; 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=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=XinlraB2lHvBXCTh4/QDWsQMNtc8+/ZdOxAPyPV1Oi+jB62ZjYb7RjMcautOTMO4LMuAbl fgg9Ni5EBapVqdsqbuYWTq2aan1R/C11TJkBVgsqcsoNZRKftCzIFFOAQD+ZRrIwYimEtn c529SzLzJ1JrBzKneifnEXU4ibyErYXweONlgjr4UayVGYt3UonNoYa45enWlV2a1VUOqQ ewVCOz7MP5Q3Wu1ji12NYbs+LGd2FHHSswmRpDMV4Coz8uxuc0y6yMWNy7+1eo8hhIkkfu ZpPb59apnn80kIEIB6v4W9HViDk9deDsg9EIJvbqyZ0L1dJdsmG0QLKrBaA4oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g905s6VGxz18P7 for ; Tue, 05 May 2026 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4348c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 13:41:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9f2ad7c09709 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 13:41:05 +0000 Message-Id: <69f9f371.4348c.7e92a692@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2ad7c09709e01ff6b856df0315e91ddc20df32 commit 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Author: Baptiste Daroussin AuthorDate: 2026-05-05 12:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-05 13:39:58 +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 --- 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;