saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 77f441ddabfff5ba24f0ecfb5eb353c9b3ddf6cd..cdc05c5a627b1362ccfe947ad26ef9cfbebc27f1 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -273,6 +273,7 @@ maybe chmod 0644 'env.d/20php5.6'
 maybe chmod 0644 'env.d/20php7.0'
 maybe chmod 0644 'env.d/30gnupg'
 maybe chmod 0644 'env.d/37fontconfig'
+maybe chmod 0644 'env.d/50baselayout'
 maybe chmod 0644 'env.d/50guile'
 maybe chmod 0644 'env.d/50ncurses'
 maybe chmod 0644 'env.d/50oracle-instantclient'

diff --git a/env.d/50baselayout b/env.d/50baselayout
new file mode 100644 (file)
index 0000000..1bf6bda
--- /dev/null
+++ b/env.d/50baselayout
@@ -0,0 +1,9 @@
+# /etc/env.d/50baselayout
+# Do not edit this file
+
+PATH="/usr/local/bin:/usr/bin:/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"
+LDPATH='/lib64:/usr/lib64:/usr/local/lib64:/lib32:/usr/lib32:/usr/local/lib32:/lib:/usr/lib:/usr/local/lib'

diff --git a/gentoo-release b/gentoo-release
index 5f0944f7d9a7490f8318527ecc91f2a998b2725b..809babf1a4c9c099137fa76d5a7151a1f4ef8dd6 100644 (file)
--- a/gentoo-release
+++ b/gentoo-release
@@ -1 +1 @@
-Gentoo Base System release 2.3
+Gentoo Base System release 2.4.1

diff --git a/profile b/profile
index e085efa33711fae50438947bf49db3b8684b33e0..75c1f870bd15cdf654b3e161c89eada095107e67 100644 (file)
--- a/profile
+++ b/profile
@@ -23,9 +23,7 @@ umask 022
 # 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="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}${ROOTPATH-}"
-else
-       PATH="/usr/local/bin:/usr/bin:/bin${PATH:+:}${PATH-}"
+       PATH="${ROOTPATH}"
 fi
 export PATH
 unset ROOTPATH

diff --git a/services b/services
index d6b2bb4c5bea06833963bd2095504f989468fb23..c5b673f4f44ba5d45fc1cdc318c26272da56f01e 100644 (file)
--- a/services
+++ b/services
@@ -803,6 +803,8 @@ redstorm_find       2347/tcp                        # Game Announcement and Location
 redstorm_find  2347/udp
 redstorm_info  2348/tcp                        # Information to query for game status
 redstorm_info  2348/udp
+etcd-client    2379/tcp                        # etcd client communication
+etcd-server    2380/tcp                        # etcd server to server communication
 cvspserver     2401/tcp                        # CVS client/server operations
 cvspserver     2401/udp
 venus          2430/tcp                        # codacon port

diff --git a/shells b/shells
index 05a36e3a73b3401d8cd44af397787973c08ff8bf..db18c4376a42fa0bcfbc1f7f61472729201a7cd0 100644 (file)
--- a/shells
+++ b/shells
@@ -5,6 +5,7 @@
 /bin/esh
 /bin/fish
 /bin/ksh
+/bin/mksh
 /bin/sash
 /bin/sh
 /bin/tcsh