From 497cdf9673ec53d59634bb78862cd8dea3d5c155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Fri, 9 Sep 2022 13:08:43 +0000
Subject: [PATCH] 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