From nobody Mon Jul 21 17:15:10 2025 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 4bm6Tp6xRcz62tPK; Mon, 21 Jul 2025 17:15:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm6Tp4wyMz3ZR1; Mon, 21 Jul 2025 17:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753118110; 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=ozu9Q5i2TwE+JMY+KAZbjK7O2fQZVxL0wy/kt3o1YKE=; b=UEL+d6WAkuPzBjJQUiD0WMojQBVJtX8/1w7LU/mfBzPPHwLkWW3p58MRD4zLn3fck1jxrW +doVQPKXSSoXlGJxZx279qFiYyBlwsmgVNrYQ2SVvBWzPN/+epxVPSZOxT7rrYpCZ9pPd/ aytrRSWQ6ECLlfHbea6awKV5yBJL/gZKhD9nveTZpBgcmgVGXvLEXnbXImN5CqJVJ0Et58 Hm+toOVbY7qrDmkQ0WFwVDRhve6gqsOoY4HicTbyVofquoLrRKLGyaOg4GYwEnUbV9c73H SZSV6AF+v8eyZxhQqCkYKqMFmoR5bZQIDZTOhADH9jb7V0woH5iu37Hpl9WN9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753118110; 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=ozu9Q5i2TwE+JMY+KAZbjK7O2fQZVxL0wy/kt3o1YKE=; b=J3RUFShtN/NCI4RnK4UiRZkO1UEjHcA2p1nkVSq9fQyZ7sbClNIbPfvTvwLj2bX7Sc2dS5 Lny6xlKlANtZtN3ElK3CdKebubOTssDbGGcm6PBagcsUOo6OoiU/fkQbmmSWt140dtIy9c qXNV4YYC6Q/UqAvtGht5di5rJOamk7c3g/actvsuebEJTyrY/zaQZgeyY7R7g2tnlAtxXC zBLwk4/KyWtWkneSLbB9tXKVWLOH8zLjRrZfw6P3FcTlDC9aVmfMTWmcr6AnkUj1y4cBGA r7DuEboxOQ5pBn45Q4BsqaAm6y4oC22cNxEYW8hWpPhT9ljtaNnbLhbtTIx0ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753118110; a=rsa-sha256; cv=none; b=cxnX+EPiax3w+bbfupokSGfJ0O3M2OGdDwYprXHBmBZAU6RFhJIxDQDui3x22bxwoxbmWt 1KD1zevhzGn4MRHbtZpx24ILRNr3slqwWB1FJCicidH9hURuc+kCMTnmGOjr45YRkDREUA KOZnmEAiA2YDxW11EmxUtbAvo4TkZ1Qhmrnxm8KusPVVIuAJC+DdsC0NWdvKFad5jLyWXN smeJcY2xOUQvRetNPdKZWR35+9Hzd7lsqhgKOeYm4Gwf67DDNLkx/5RHSpUUBVuGyV1Tm8 YG5+JGTcdil1cT+k25rnXQR0Ia+cZLFQ5qSSo9vHxxonVWvkIdPZM++H4yv/Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bm6Tp4Xf2z15fX; Mon, 21 Jul 2025 17:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56LHFAne017675; Mon, 21 Jul 2025 17:15:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LHFAVo017673; Mon, 21 Jul 2025 17:15:10 GMT (envelope-from git) Date: Mon, 21 Jul 2025 17:15:10 GMT Message-Id: <202507211715.56LHFAVo017673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: cae98cf683dd - main - install: allow ENV in metatags 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cae98cf683ddd1421f4b66bb6aa7099ca6da94ef Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cae98cf683ddd1421f4b66bb6aa7099ca6da94ef commit cae98cf683ddd1421f4b66bb6aa7099ca6da94ef Author: Simon J. Gerraty AuthorDate: 2025-07-21 17:14:00 +0000 Commit: Simon J. Gerraty CommitDate: 2025-07-21 17:14:00 +0000 install: allow ENV in metatags The metatags file informs install of kernel and modules to load, allow it to also case variables to be set in env. Reviewed by: imp Sponsored by: Juniper Networks, Inc Differential Revision: https://reviews.freebsd.org/D51446 --- stand/common/install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/common/install.c b/stand/common/install.c index 249eca1648f3..d07c4c6fc620 100644 --- a/stand/common/install.c +++ b/stand/common/install.c @@ -137,7 +137,9 @@ read_metatags(int fd) } *p++ = '\0'; - if (strcmp(tag, "KERNEL") == 0) + if (strncmp(tag, "ENV_", 4) == 0) + setenv(&tag[4], val, 1); + else if (strcmp(tag, "KERNEL") == 0) error = setpath(&inst_kernel, val); else if (strcmp(tag, "MODULES") == 0) error = setmultipath(&inst_modules, val);