From nobody Fri Feb 02 19:06:08 2024 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 4TRQGm63Ccz59J17; Fri, 2 Feb 2024 19:06:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRQGm4H0xz4mMr; Fri, 2 Feb 2024 19:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900768; 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=8PEiJpVjA2qFkBIZBVFV/o1nDbwUHpWFKEJikI7IaRg=; b=H1U2Vs/8mq+0YUuHB/JRF6RRxe3tsoMHkrhoTym8cWa3BtmYLkqLQeY/RL1erpvwqmyV8I uyZtYp9c7PxgQ0pm6hC1xwWNl/3Tldb3lTo6FS7FeJbDucIQQiEKBjF4VmHWOnnI2uzXin J+8EH5e4bd3Q1AP9z4SP9m/m8vYXkUoiICm7eiEBkp9SqDDvjZliAhk2x2UjJiUkFRYc9A bgIovBc4TsL7+JowcJ4g1BnOuQOLzzIG0CGkmTI7qsas0kAaHXHdcw51W3+nJwWWtQyOGq CkYf6SuudSY6fSBx4MSce3pA8BKz4C9wYdUELDGY9Qk9L9KrFEbEu0FhFhp8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900768; 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=8PEiJpVjA2qFkBIZBVFV/o1nDbwUHpWFKEJikI7IaRg=; b=sOmtdf5A8SFa9yqnjioz6F8aMuD67XS5T79F+S7Mmvd5NAfreokoFXVurD0LnJDnZC2DrG 3U5pgWSszsLYfzuzK/85ZzxUtVeoRNXzJZS7cUp6iRiMQ+OpTkxC56HGWRTuwhRcT6lR2k ECNxmw3r+rDXiCOtq07d/fO3ARrHuA98lXnqo9reC6nSJxJCUE40NhMctqaFdhQ0LlMftt OYiJmyV5lq/NHUvHWMxzf4ajRdPGN2ICDsvaJenJcK06e1aXx+TWdtVNk9Rx50cdR8tpEB +olUYuWZLhewhIh5IBklFCSwMt9hxwtoF7/+A7e4rgImp/xVmt8wrbR6tURfJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900768; a=rsa-sha256; cv=none; b=rfok5vTm6L8tlEsCojViUlNaNW3JAUgOdBjr1VstdkBGOeRCJF8G3j0b0ekVrrluj30P81 mNhWJmljpYhL20YM2cWp8pJNDdK9CH1Nmz5pbugZku/tA8UGfQNq3g/odKp/YvMYc7XXpO EfEOmlp3//y3UqRij6bX74cO510PksdYZBDNatao1CIAS3qp/3eBeDdxatjWXcrD6bB25O NEVafvBUOM2QRn+VHVAqDg+g332Prnjaf8GpTyhtCfMr5xutktOjejXSD+dvA7sVf7GnvO E9kLvuqn3RytFgayq4Hpn+yqQ+WzIApQ0Zemj00q2Yeef1ov8pjdf4Xq7wE5zQ== 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 4TRQGm3N5lzj1x; Fri, 2 Feb 2024 19:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412J68tR054957; Fri, 2 Feb 2024 19:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J68co054954; Fri, 2 Feb 2024 19:06:08 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:08 GMT Message-Id: <202402021906.412J68co054954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c343eedc6db3 - main - stand/lua: per-product conf if requested via product_vars 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c343eedc6db381ac76e489f8ae0304898b71c5db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c343eedc6db381ac76e489f8ae0304898b71c5db commit c343eedc6db381ac76e489f8ae0304898b71c5db Author: Stéphane Rochoy AuthorDate: 2023-05-04 07:23:47 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 stand/lua: per-product conf if requested via product_vars If product_vars is set, it must be a space separated list of environment variable names to walk through to guess the product. Each time a product can be guessed (i.e., the corresponding variable is defined), prepend /boot/loader.conf.d/PRODUCT/ to loader_conf_dirs. It can be typically used as follow: smbios.system.planar.maker="PLANAR_MAKER" smbios.system.planar.product="PLANAR_PRODUCT" smbios.system.product="PRODUCT" uboot.m_product="M_PRODUCT" product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product" to read files found in the following directories, in that order: /boot/loader.conf.d/PLANAR_MAKER /boot/loader.conf.d/PLANAR_PRODUCT /boot/loader.conf.d/PRODUCT /boot/loader.conf.d/M_PRODUCT Reviewed by: imp, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/759 --- stand/defaults/loader.conf.5 | 34 +++++++++++++++++++++++++++++++++- stand/lua/config.lua | 25 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 42e5712d93b8..0d82a3dac9b3 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd January 10, 2024 +.Dd February 2, 2024 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -138,6 +138,38 @@ present file. should be treated as write-only. One cannot depend on any value remaining in the loader environment or carried over into the kernel environment. +.It Ar product_vars +When set, must be a space separated list of environment variable names to walk +through to guess product information. +The order matters as reading a config file override the previously defined +values. +Undefined variables are silently ignored. +.Pp +When product information can be guessed, for each product information found, +append +.Pa /boot/loader.conf.d/PRODUCT +to +.Ar loader_conf_dirs . +It can be typically used as follow: +.Bd -literal +smbios.system.planar.maker="PLANAR_MAKER" +smbios.system.planar.product="PLANAR_PRODUCT" +smbios.system.product="PRODUCT" +uboot.m_product="M_PRODUCT" +product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product" +.Ed +.Pp +to read files found in the following directories, in that order: +.Bl -bullet -compact +.It +.Pa /boot/loader.conf.d/PLANAR_MAKER +.It +.Pa /boot/loader.conf.d/PLANAR_PRODUCT +.It +.Pa /boot/loader.conf.d/PRODUCT +.It +.Pa /boot/loader.conf.d/M_PRODUCT +.El .It Ar kernel Name of the kernel to be loaded. If no kernel name is set, no additional diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 8fdc805ee983..210bb9338783 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -658,12 +658,37 @@ function config.readConf(file, loaded_files) if load_conf_dirs then local loader_conf_dirs = getEnv("loader_conf_dirs") + + -- If product_vars is set, it must be a list of environment variable names + -- to walk through to guess product information. The order matters as + -- reading a config files override the previously defined values. + -- + -- If product information can be guessed, for each product information + -- found, also read config files found in /boot/loader.conf.d/PRODUCT/. + local product_vars = getEnv("product_vars") + if product_vars then + local product_conf_dirs = "" + for var in product_vars:gmatch("%S+") do + local product = getEnv(var) + if product then + product_conf_dirs = product_conf_dirs .. " /boot/loader.conf.d/" .. product + end + end + + if loader_conf_dirs then + loader_conf_dirs = loader_conf_dirs .. product_conf_dirs + else + loader_conf_dirs = product_conf_dirs + end + end + if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then print(MSG_FAILDIR:format(name)) goto nextdir end + for cfile in lfs.dir(name) do if cfile:match(".conf$") then local fpath = name .. "/" .. cfile