commit: 277e5b9e55717873b87eb541a95f4f2ae0c60a4d
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 18:36:31 2018 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat May 26 19:35:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=277e5b9e
Add sbin directories to path
This is a partial revert of 9cac4dd130637fa2c1f1a64bf3c9d2509284e6dd.
We need to have path and rootpath be the same, to allow transitioning
packages before we drop rootpath.
etc/env.d/50baselayout | 1 +
etc/profile | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/etc/env.d/50baselayout b/etc/env.d/50baselayout
index b10a2c4d..694a2336 100644
--- a/etc/env.d/50baselayout
+++ b/etc/env.d/50baselayout
@@ -2,6 +2,7 @@
# Do not edit this file
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
+ROOTPATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
MANPATH="/usr/local/share/man:/usr/share/man"
INFOPATH="/usr/share/info"
CONFIG_PROTECT_MASK="/etc/gentoo-release"
diff --git a/etc/profile b/etc/profile
index 4579bd17..8e92e824 100644
--- a/etc/profile
+++ b/etc/profile
@@ -18,6 +18,16 @@ export PAGER=${PAGER:-/usr/bin/less}
# 077 would be more secure, but 022 is generally quite realistic
umask 022
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+if [ "${EUID-}" = "0" ] || [ "${USER-}" = "root" ] ; then
+ PATH="${ROOTPATH}"
+fi
+export PATH
+unset ROOTPATH
+
# process *.sh files in /etc/profiled.d
for sh in /etc/profile.d/*.sh ; do
[ -r "$sh" ] && . "$sh"
