From nobody Mon Apr 27 03:21:34 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 4g3pkk4JyYz6bb0p for ; Mon, 27 Apr 2026 03:21:34 +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 4g3pkk1ghWz3lL2 for ; Mon, 27 Apr 2026 03:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777260094; 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=8zxOPJOdjvfEU5aIVAi0H/uxvGqmuZDF/V4xQfX0pmw=; b=VhzP4hMMc7Maf7acL7x+y0+7OMKmVpiJdZmZIabUPHf+IVL6OAoSB1lchIPudBtl/vM2aD bgWgt9Bu3LsVQskxQMtMIFCZShkGGAKuJyRk54G7uMchSiZ4pXnIAqfCvnygIu28D/TU5a tu4OqrZsihcW0A9Xlfc9ycdu8MnQbJhEo5HHTmsA+Iz3XcvrE5C7LSi9x48fW3X+Hm1Vg7 4LV/cxUhm2S7T8gSc/vlSfw1IrraG17mv9GeotVZhNc3yle/+NhEfo6LjG/XIk4G+wJUS6 vWGlJF0fmXdRrld88DAD0VhpfnE5AF88WmeqhWhP4DlRk1mrLTEL2KBIPsEGAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777260094; a=rsa-sha256; cv=none; b=qQpKfXZ3ywF1ST7blYuMrFIarNC0TPVWGfrt7GByWKZbT2vqSAh8iCnUZ0iFr/LvqHI4XL yMNrsvZLC8dU0Q0Zk0doCk+Pc40Xp9ltbga+GWv0Oq+qmeY5z/NcgNDqS1x7S95+W+RsOy 0tdvmvPwcvEeA22XhiCHLblaewHnenPKZ6k7rrczOuH6v0E8K7iWeZ2nV4iA9TbQE4JmR2 P79OM0ODp32UE/oIdUXnGnRiH5eNBBOSLA8K++q3Jb454e2axfe6NW7NpGEpNm0m91r52R A388fnZkSPcRp++EAp0Co1vsNi4Z8WzzI/XtXcdK/rNbuoT4HWjMTlsblxTnBg== 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=1777260094; 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=8zxOPJOdjvfEU5aIVAi0H/uxvGqmuZDF/V4xQfX0pmw=; b=Xy+2AnGTlMSsJKFrbbconyV4G+YEijgS9juSxZ47pvGdwApf3qZR0WD6GsgDcMFRVr//c5 ueVSsbkBxKzflMBSv5roouQtq13vextAaVNmfkKfthjKkD5pmdPtAld+THSnXzvgO9kkQI sg0LmeE4TmhqZQ/k5/YUIh9d0ieTfDE9fzeIEoF4zoQ0NXWBekacJS1sSXTM7RyYclRO31 MU2udBbE9PHd7/Pjg7UaIWUP12/WP1Hlf4wCIKtAS2ZBdHofJgPE4ZbkYY3KjH83Q7vRho A5VllYQX3v4MiVC8Vdd5DMRn1ftw5OBushOgaWl9HAl+lnlGx7M+Xi8vxF0ZYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3pkk0jRqzqCH for ; Mon, 27 Apr 2026 03:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 03:21:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d7338bb4914d - main - bin/sh: make it possible to use as interactive init 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7338bb4914d120e5719d3216b23a509c49ed3be Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 03:21:34 +0000 Message-Id: <69eed63e.3af1e.59d3cfe4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7338bb4914d120e5719d3216b23a509c49ed3be commit d7338bb4914d120e5719d3216b23a509c49ed3be Author: Konstantin Belousov AuthorDate: 2026-04-20 18:03:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-27 01:45:12 +0000 bin/sh: make it possible to use as interactive init If the /sbin/init binary is broken somehow, the way out is to set the loader environment variable init_path to something else. The most natural choice would be either /bin/sh or /rescue/sh. Unfortunately, this does not work because the init process starts withoud stdin/out descriptors. Make it nicer to users by teaching /bin/sh startup code to open standard descriptors on /dev/console if the shell is run as init. Reviewed by: imp, jilles, zlei Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56536 --- bin/sh/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/bin/sh/main.c b/bin/sh/main.c index 94e8da6b4921..0ca2d4942426 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -39,6 +39,9 @@ #include #include #include +#include +#include +#include #include "shell.h" #include "main.h" @@ -124,6 +127,22 @@ main(int argc, char *argv[]) trputs("Shell args: "); trargs(argv); #endif rootpid = getpid(); + if (rootpid == 1) { + /* + * Make sh usable for invocation as interactive init + * substitute with init_path=/bin/sh, by opening + * file descriptors 0, 1, and 2 on /dev/console. + */ + if (fcntl(STDIN_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) { + (void)open(_PATH_CONSOLE, O_RDWR); + (void)setsid(); + (void)tcsetsid(STDIN_FILENO, rootpid); + } + if (fcntl(STDOUT_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) + (void)dup2(STDIN_FILENO, STDOUT_FILENO); + if (fcntl(STDERR_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) + (void)dup2(STDIN_FILENO, STDERR_FILENO); + } rootshell = 1; INTOFF; initvar();