saving uncommitted changes in /etc prior to emerge run

diff --git a/env.d/50baselayout b/env.d/50baselayout
index 1bf6bda04df86965d97018d9f171b0b1c54b954a..9efe6c7d76ade3a1fcf00443c772346e7b3ff9a3 100644 (file)
--- a/env.d/50baselayout
+++ b/env.d/50baselayout
@@ -1,7 +1,7 @@
 # /etc/env.d/50baselayout
 # Do not edit this file
 
-PATH="/usr/local/bin:/usr/bin:/bin:/opt/bin"
+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"

diff --git a/gentoo-release b/gentoo-release
index 809babf1a4c9c099137fa76d5a7151a1f4ef8dd6..1735fa74970948ea53a906c38c0b157e874ef26b 100644 (file)
--- a/gentoo-release
+++ b/gentoo-release
@@ -1 +1 @@
-Gentoo Base System release 2.4.1
+Gentoo Base System release 2.6

diff --git a/profile b/profile
index 75c1f870bd15cdf654b3e161c89eada095107e67..2afd51d9fe3547958045dcea0fb462aefcc85ba4 100644 (file)
--- a/profile
+++ b/profile
@@ -18,16 +18,14 @@ 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/profile.d
+for sh in /etc/profile.d/*.sh ; do
+       [ -r "$sh" ] && . "$sh"
+done
+unset sh
+
 if [ -n "${BASH_VERSION-}" ] ; then
        # Newer bash ebuilds include /etc/bash/bashrc which will setup PS1
        # including color.  We leave out color here because not all
@@ -50,8 +48,3 @@ else
        # understand sequences such as \h, don't put anything special in it.
        PS1="${USER:-$(whoami 2>/dev/null)}@$(uname -n 2>/dev/null) \$ "
 fi
-
-for sh in /etc/profile.d/*.sh ; do
-       [ -r "$sh" ] && . "$sh"
-done
-unset sh