From nobody Sat Oct 01 21:31:18 2022 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 4Mg0dy5xN6z4f3DW; Sat, 1 Oct 2022 21:31:18 +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 4Mg0dy5Tc3z3PR2; Sat, 1 Oct 2022 21:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664659878; 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=MAK9oCTqP9JtTjth/pZGszC2KnICPG3ITRuEHzfqxh0=; b=VZj9xdRREX0FMYIKz4QdETeU5KJy/g+1jqHb54vXNBcu6hmI/VqXBTFYLnaIMY8BCsyTYR oBf0pT5dSU4eO0mJ8ChhOf63uyuVv+jurWIWg4Wc4IrrWaZi+VwG+BkxuIKS/vab5X1vkc 4+Rp2WtuzEReI3F4QoxUf1lJR5NMxe4Fvgp/vYlHwKs98y3iKCdfreBMJl43yVlDHxkqxW sM94k8pxQ998K7K4SSXT/VFREjacjXaM+n9txAbDnHxFoqClMJGMrmNBPc+qEo892tu7Cs /yw9sd6kUrOdB4bo0nFGXruJRQyZ7Ba07wOJ7OOnOPuOxYHJs1nX0VQGuqlxYA== 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 4Mg0dy4YJ6zfPN; Sat, 1 Oct 2022 21:31:18 +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 291LVIoR044704; Sat, 1 Oct 2022 21:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291LVIY8044703; Sat, 1 Oct 2022 21:31:18 GMT (envelope-from git) Date: Sat, 1 Oct 2022 21:31:18 GMT Message-Id: <202210012131.291LVIY8044703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 497cdf9673ec - main - sh: read more profile files. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 497cdf9673ec53d59634bb78862cd8dea3d5c155 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664659878; 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=MAK9oCTqP9JtTjth/pZGszC2KnICPG3ITRuEHzfqxh0=; b=fDkhTWkRGdg0vRNWLsYEows+KlrCqs8Tb95d41oH/o5jgbLXmnwZUJ8v0hZn1uaOdDfYJC KOuCYsrxUGhkvX2d9Q3hfrB3YZmymfeBbvH7/7piWbJLviOBZ300mhYL5d4k9eDlyAkaIc RBg6akITJtjoVxst7rWt5FAbM4CPiT1RvxzCpe9JUJWRJ1+jvAqssmnioijrv8byr7lOP6 X0vQ9h62U6585TAGQcNMxqK0RoX4tJ/GrRgNb925Sasr3diEvV0NXaA5RiJ8fx45gZVvrK DRa8RRwYwwpNMm2FI0ODZpOhqv3l6zkQ6gY3TyQl1ldtIV3fItoV7RhEOZrxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664659878; a=rsa-sha256; cv=none; b=d+neOo9PFpl94jmCGLcGobI94wP9Hv1pbWFf0v9NI3ikYO9mhdwn/gUlK4n3KvmvTFpAN+ WgKKG0rhbRBAkJ0lz9VvYnLwf8db1YRioIB+265wZdf7xpMKpZOXxKCEUHxA8KFLyVXp+5 N0pfuN/xuHE8+WnpgaZwYgxA8VyEaDmYay7LWqzqg4pvnaK5l2O6tKje0kII3gvH3dDn+2 J8R9EPMdbf8idvYqslqzAlmLJivjMeWasDasJYkeXVcDyagWnvvXM3y4rkkDxQp1R7s1EX VJv9tPXJ00cUixCHgAiwE2dCeInRKOFzMTj0+EZLqXJ2yvDIgU8l0lHrsf3o8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=497cdf9673ec53d59634bb78862cd8dea3d5c155 commit 497cdf9673ec53d59634bb78862cd8dea3d5c155 Author: Dag-Erling Smørgrav AuthorDate: 2022-09-09 13:08:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-10-01 21:30:56 +0000 sh: read more profile files. Differential Revision: https://reviews.freebsd.org/D36505 MFC after: 1 month --- 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..afcbeaf4110b 100644 --- a/bin/sh/profile +++ b/bin/sh/profile @@ -12,3 +12,23 @@ # msgs -q # Allow terminal messages # mesg y + +# Load each file in /etc/profile.d/, then /usr/local/etc/profile, then +# each 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/* ; 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 8bea31212217..5ee5da8ee149 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -84,6 +84,8 @@ .. ppp .. + profile.d + .. rc.conf.d .. rc.d