From 44f650899789030d77a8922c52d4138855a173d0 Mon Sep 17 00:00:00 2001 From: fbrehm Date: Thu, 31 May 2012 01:31:32 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- ._cfg0000_profile | 63 +++++++++++++++++++++++++++++++++++++++++++++++ .etckeeper | 1 + env.d/00basic | 2 +- gentoo-release | 2 +- 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 ._cfg0000_profile diff --git a/._cfg0000_profile b/._cfg0000_profile new file mode 100644 index 0000000..2dee463 --- /dev/null +++ b/._cfg0000_profile @@ -0,0 +1,63 @@ +# /etc/profile: login shell setup +# +# That this file is used by any Bourne-shell derivative to setup the +# environment for login shells. +# + +# Load environment settings from profile.env, which is created by +# env-update from the files in /etc/env.d +if [ -e /etc/profile.env ] ; then + . /etc/profile.env +fi + +# You should override these in your ~/.bashrc (or equivalent) for per-user +# settings. For system defaults, you can add a new file in /etc/profile.d/. +export EDITOR=${EDITOR:-/bin/nano} +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. +# +# It is intentional in the following line to use || instead of -o. +# This way the evaluation can be short-circuited and calling whoami is +# avoided. +if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" +else + PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" +fi +export PATH +unset ROOTPATH + +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 + # terminals support it. + if [ -f /etc/bash/bashrc ] ; then + # Bash login shells run only /etc/profile + # Bash non-login shells run only /etc/bash/bashrc + # Since we want to run /etc/bash/bashrc regardless, we source it + # from here. It is unfortunate that there is no way to do + # this *after* the user's .bash_profile runs (without putting + # it in the user's dot-files), but it shouldn't make any + # difference. + . /etc/bash/bashrc + else + PS1='\u@\h \w \$ ' + fi +else + # Setup a bland default prompt. Since this prompt should be useable + # on color and non-color terminals, as well as shells that don't + # 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 diff --git a/.etckeeper b/.etckeeper index 17e2305..6d86a14 100755 --- a/.etckeeper +++ b/.etckeeper @@ -37,6 +37,7 @@ mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' +maybe chmod 0644 './._cfg0000_profile' maybe chmod 0700 './.etckeeper' maybe chmod 0600 './.gitignore' maybe chmod 0600 './.pwd.lock' diff --git a/env.d/00basic b/env.d/00basic index 8e2d1bd..64e3882 100644 --- a/env.d/00basic +++ b/env.d/00basic @@ -3,7 +3,7 @@ PATH="/opt/bin" ROOTPATH="/opt/bin" -LDPATH="/usr/local/lib" 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 12f72c1..0c77c69 100644 --- a/gentoo-release +++ b/gentoo-release @@ -1 +1 @@ -Gentoo Base System release 2.0.3 +Gentoo Base System release 2.1 -- 2.39.5