From nobody Fri Feb 2 19:06:06 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 4TRQGk37cgz59Hh9; Fri, 2 Feb 2024 19:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRQGk2DS1z4mMh; Fri, 2 Feb 2024 19:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900766; 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=mAb9wZF5UuL3TVIeKf7nM+CoMk/5u/BmdJmmwUGpZO0=; b=cY9g7kPvX2IGcY30pf1+aoTBmpi0IpD9NJ4p2lSRL0Vdzhz525zN+pFYagbktx9jLFSdIa JNpdblkmLV/76T3KMPRP2aWgGf0IzmNeFXRUyoR+AHHgHDnACad/0OBh5tVij9vA9SDjBD myY955dfAp+OuHIJmO10mcZ4H/tXVTtfA6/DRF6lYOd8cgPsbo7Ql1tqonNPyEzyV5KvRx CJLDHw3n8gMU49QVKXPe26rL2SSeBCDXIN5uBgLxnVgyFzNVt4KFhH+EVQeHtR0A2PRkQA 2LqPbrqlnNQwRGBgUALuO6nhF92uddVU/xHRVyNtRnWnDNh1NKkboA8j3gLutg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900766; 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=mAb9wZF5UuL3TVIeKf7nM+CoMk/5u/BmdJmmwUGpZO0=; b=PPr0NrR89d1ie+ZBdTHkaXlIzbN2TFElkQqrKDG8TBj+EQvWyYuIVL0T4c8ATgZ20Sfuzd ie26RC3PzwMUFLIvLoV+FFYScUTLVrwy6vCHYVHnAGudCYc+n9YZ+zxT+UgGkWtId471sP wk44Rr/md8onvkBOQ6Ze5apNHCktYelauoqoxwrFAhAD3RhXMuBcsc10hwn5rXwqySQ/Yx RzwbkheRerrsIPHrfyPQhnw1bStX1fJdU63fNvm5UfccjkBfVNmNQFha5eBl41fOTgvccD AiBxgc5RvaibbJamwoi/Rfc183bI+qMb+KzhfDfXFhbNfdn8gFxwk1jKQsnG5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900766; a=rsa-sha256; cv=none; b=yxiSOwLObMSVD18X70tZyuwghKjiV9nJ4W/rsxGiIE7v/98O/Ewxrts5BoEQWd+hPIaSpt +0DA0gtWYxbj7oc0FjK6JyH9c48xmWxfWPoscPyQ+KNToOU/GwX6nqS0rUtZsxM/dXdFjc +M7k/zp36YgsZi1c0gjty9D6lnWmHfb21BKjLar9pWkM79l5qFXuQRuDTjxPE9v8WJ6rVp WQ0G7qI92AAEwuu+6xiNCd2Q6ybn6aSVsbScW+Z0qMChCOW4CQG9Urnfsx06qJ7/vZI+f7 /7QEJO1J/mQpL8GC5gnwirl6agk65U1UxYEIy3yu2m07nGhz2Dhib9qetWCpSA== 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 4TRQGk1HnYzj1w; Fri, 2 Feb 2024 19:06:06 +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 412J66nu054858; Fri, 2 Feb 2024 19:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J667P054855; Fri, 2 Feb 2024 19:06:06 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:06 GMT Message-Id: <202402021906.412J667P054855@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: 5fdf01dbeef1 - main - Revert "stand/lua: always allow overriding with local config files" 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: 5fdf01dbeef1f64f8c446561498d662702451ac1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fdf01dbeef1f64f8c446561498d662702451ac1 commit 5fdf01dbeef1f64f8c446561498d662702451ac1 Author: Warner Losh AuthorDate: 2024-02-02 19:01:56 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 Revert "stand/lua: always allow overriding with local config files" This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe. no mail sent out, and the commit message was wrong. Sponsored by: Netflix --- UPDATING | 21 --------------------- stand/defaults/loader.conf | 3 +-- stand/defaults/loader.conf.5 | 32 ++++---------------------------- stand/lua/config.lua | 15 +++------------ stand/lua/config.lua.8 | 8 ++------ 5 files changed, 10 insertions(+), 69 deletions(-) diff --git a/UPDATING b/UPDATING index 33bae2a42b9d..14fae1eb0656 100644 --- a/UPDATING +++ b/UPDATING @@ -27,27 +27,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20240202: - Loader now also read configuration files listed in local_loader_conf_files. - Files listed here are the last ones read. And /boot/loader.conf.local was - moved from loader_conf_files to local_loader_conf_files leaving only - loader.conf and device.hints in loader_conf_files by default. - - The following sequencing is applied: - - 1. Bootstrap: - /boot/defaults/loader.conf - - 2. Read loader_conf_files files: - /boot/device.hints - /boot/loader.conf - - 3. Read loader_conf_dirs files: - /boot/loader.conf.d/*.conf - - 4. And finally, rread local_loader_conf_files files: - /boot/loader.conf.local - 20240201: sendmail 8.18.1 has been imported and merged. This version enforces stricter RFC compliance by default, especially with respect to line diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index a5d27b96b6ba..e0062bbc8149 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -13,9 +13,8 @@ exec="echo Loading /boot/defaults/loader.conf" kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" # Flags to be passed to the kernel -loader_conf_files="/boot/device.hints /boot/loader.conf" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" loader_conf_dirs="/boot/loader.conf.d" -local_loader_conf_files="/boot/loader.conf.local" nextboot_conf="/boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index e38ad865c288..0d82a3dac9b3 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -131,10 +131,6 @@ Space separated list of directories to process for configuration files. The lua-based loader will process files with a .Dq .conf suffix that are placed in these directories. -Files found here are processed after the ones listed in -.Va loader_conf_files -but before the ones found in -.Va local_loader_conf_files . .It Ar loader_conf_files Defines additional configuration files to be processed right after the present file. @@ -142,13 +138,6 @@ 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 local_loader_conf_files -Space separated list of additional configuration files to be processed at last, -i.e., after -.Va loader_conf_files -and -.Va loader_conf_dirs -are processed. .It Ar product_vars When set, must be a space separated list of environment variable names to walk through to guess product information. @@ -285,14 +274,6 @@ default settings can be ignored. The few of them which are important or useful are: .Bl -tag -width bootfile -offset indent -.It Va local_loader_conf_files -.Pq Dq /boot/loader.conf.local -Ensure -.Va loader.conf.local -can always be used to override settings from files found in -.Va loader_conf_files -and -.Va loader_conf_dirs . .It Va bitmap_load .Pq Dq NO If set to @@ -474,18 +455,13 @@ It is not available in the default Forth-based loader. .Sh FILES .Bl -tag -width /boot/defaults/loader.conf -compact .It Pa /boot/defaults/loader.conf -Default settings \(em do not change this file. +default settings \(em do not change this file. .It Pa /boot/loader.conf -User defined settings. +user defined settings. .It Pa /boot/loader.conf.lua -User defined settings written in lua. -.It Pa /boot/loader.conf.d/*.conf -User defined settings split in separate files. -.It Pa /boot/loader.conf.d/*.lua -User defined settings written in lua and split in separate files. +user defined settings written in lua. .It Pa /boot/loader.conf.local -Machine-specific settings for sites with a common loader.conf. Allow to override -settings defined in other files. +machine-specific settings for sites with a common loader.conf. .El .Sh SEE ALSO .Xr kenv 1 , diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 86f5ef6174a2..210bb9338783 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -630,7 +630,8 @@ function config.readConf(file, loaded_files) return end - local top_level = next(loaded_files) == nil -- Are we the top-level readConf? + -- We'll process loader_conf_dirs at the top-level readConf + local load_conf_dirs = next(loaded_files) == nil print("Loading " .. file) -- The final value of loader_conf_files is not important, so just @@ -655,7 +656,7 @@ function config.readConf(file, loaded_files) end end - if top_level then + 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 @@ -681,7 +682,6 @@ function config.readConf(file, loaded_files) end end - -- Process "loader_conf_dirs" extra-directories if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then @@ -700,15 +700,6 @@ function config.readConf(file, loaded_files) ::nextdir:: end end - - -- Always allow overriding with local config files, e.g., - -- /boot/loader.conf.local. - local local_loader_conf_files = getEnv("local_loader_conf_files") - if local_loader_conf_files then - for name in local_loader_conf_files:gmatch("[%w%p]+") do - config.readConf(name, loaded_files) - end - end end end diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index b2b1122285eb..f9896f2aa420 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -64,13 +64,9 @@ as a configuration file .Po e.g., as .Pa loader.conf .Pc -and then process files listed in the +and then processing files listed in .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the -.Ev loader_conf_dirs -and -.Ev local_loader_conf_files -variables +variable .Po see .Xr loader.conf 5 .Pc .