From nobody Wed Nov 2 15:51:19 2022 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 4N2WZv2J4Sz4gD6n; Wed, 2 Nov 2022 15:51:19 +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 4N2WZv1d1kz3d9d; Wed, 2 Nov 2022 15:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667404279; 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=PZZIvkd962JAunKC4lP90CzjyRxeMwv/L7cUoOT1iiY=; b=a2TVH1fRTrlRDbmN/Vtz9iAlmHua1QHugVlQj9kOi7qehk+nATnI8Dvsuo5xL5vRMwp/qN qbZdvLvqjDLK5Za7jPCMrLSVe9Js65Hfff88AFUYFU3iHEF+OiecxDmZYt9QWWY0sApm9X 2VCEQNqExBL7F9O9Ds5llS0SH3bamcn8rVxUk6nL1u7QG/Qo8k+U8knktRd4MgQo6UMWuT fa50x6Y6uwTn52Ej06BJKRnAlvPLpx6Pl3UZWZza82QlZGmoafa6Hsprpx/MmKxahlvW17 LQFDahY4L0CuSAv4dhBiyKxwQ3buXG8+Lf1WskDnn30B/d0Tjgb98/GTwmZw+w== 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 4N2WZv0hb6z12Bx; Wed, 2 Nov 2022 15:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A2FpJxt060774; Wed, 2 Nov 2022 15:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2FpJtN060773; Wed, 2 Nov 2022 15:51:19 GMT (envelope-from git) Date: Wed, 2 Nov 2022 15:51:19 GMT Message-Id: <202211021551.2A2FpJtN060773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 73ab1c87c208 - releng/12.4 - sh: read more profile 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: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 73ab1c87c208dbb0609be572eb31591353d71e07 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667404279; 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=PZZIvkd962JAunKC4lP90CzjyRxeMwv/L7cUoOT1iiY=; b=f8P/06iT1XwAXNc/7e4jn+aNBkEcKNba0egl1hLtzwQohlJ0Tuhta5UkhccoydIhcFNIG8 UZIZYuA5uzfkH+6XMefUIYuiDRkMxiagTbaMzr9/7m6+PE+JSQdC5p0Ey0tp7fw7cf5bWR oqaivYSa6NfIKiTMsoNL4LJisdBdybdSCjafATLLgXeSgJ10ZwqEM69107R/OiX6O67MBL BzD2/yacdPKgJ289RIFoD5rs4jh71wNVMvc/mgxIWbS1YxsbLGa8TbY6TM6MdGC7VEzgHT fljoAJvmcaUilY+pS+pM5JR4Wqyuij01505FbI6v9DGhorPg2oYxi1ZBGZ1J7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667404279; a=rsa-sha256; cv=none; b=YB2Tv6bGuTkgswk+f5PXg1cHORy7fD/EoqQs31gh6+2rOND50jCHNkKL+Cqw2ojw+oKnj7 Y4gFGTKP3juAfgxNawxBXAuNV8Ns6rjTZGKTIsDPuecIOR3TA/4hcxhvWhdWRmGuMz23qM DecVwcKHgFkkNKHfL3DTPQ0hEhj0d8d0KP1yG+Y5wrHu8AFZHaki/qCMWIT73QI8MwHt+g gUB/YbVuTPpF2CYqQLyAGldU0ZiYXvxW4I42ncy6UQHc8xYewCwlD+rtdYTuKNWml/QrPS M4erag9ZebwfiLDUGavef2CudOIwy3JZGj6eVw3IvGqMqsdx4TKBYFb/XTFv8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=73ab1c87c208dbb0609be572eb31591353d71e07 commit 73ab1c87c208dbb0609be572eb31591353d71e07 Author: Dag-Erling Smørgrav AuthorDate: 2022-09-09 13:08:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-11-02 15:51:05 +0000 sh: read more profile files. Differential Revision: https://reviews.freebsd.org/D36505 MFC after: 1 month (cherry picked from commit 497cdf9673ec53d59634bb78862cd8dea3d5c155) sh: when loading profile, skip obvious scratch files. Differential Revision: https://reviews.freebsd.org/D36856 (cherry picked from commit d3890a547d201d1f5043e51baa406ac9d5d3a60a) sh: when loading profile, read only .sh files. Reviewers: jilles, eugen_grosbein.net, cy Subscribers: imp Differential Revision: https://reviews.freebsd.org/D37034 (cherry picked from commit 8d7221ca2dd5e0b6c633761b314cffed82ddca72) (cherry picked from commit 4ea49af3afe127c424a1b843617225fd437b51d1) Approved by: re (gjb) --- bin/sh/profile | 20 ++++++++++++++++++++ etc/mtree/BSD.root.dist | 2 ++ 2 files changed, 22 insertions(+) diff --git a/bin/sh/profile b/bin/sh/profile index b77c8787c79d..5b8a57d4b7b2 100644 --- a/bin/sh/profile +++ b/bin/sh/profile @@ -12,3 +12,23 @@ # msgs -q # Allow terminal messages # mesg y + +# Load each .sh file in /etc/profile.d/, then /usr/local/etc/profile, +# then each .sh file in /usr/local/etc/profile.d/. +_loaded=${_loaded:-/etc/profile} +export _loaded +for _dir in /etc /usr/local/etc ; do + for _file in "${_dir}"/profile "${_dir}"/profile.d/*.sh ; do + if [ -f "${_file}" ] ; then + case :${_loaded}: in + *:"${_file}":*) + ;; + *) + _loaded="${_loaded:+${_loaded}:}${_file}" + . "${_file}" + ;; + esac + fi + done +done +unset _loaded _dir _file diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index cba3e9e73c79..0c70b11eed4e 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -74,6 +74,8 @@ .. ppp .. + profile.d + .. rc.conf.d .. rc.d