From: root Date: Mon, 30 Jul 2012 17:54:52 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=fffd92fe1df6f8a8c58b6adb28340d1bad6bd47f;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/bash/bashrc b/bash/bashrc index 098cd27..8f594b5 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -150,12 +150,12 @@ if [ -f /usr/share/mc/mc.gentoo ]; then . /usr/share/mc/mc.gentoo fi -if [ -e /etc/bash_completion.d/git ] ; then - if [[ ${EUID} == 0 ]] ; then - PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' - else - PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' - fi -fi +#if [ -e /etc/bash_completion.d/git ] ; then +# if [[ ${EUID} == 0 ]] ; then +# PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' +# else +# PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]' +# fi +#fi # vim: ts=4 expandtab diff --git a/resolv.conf b/resolv.conf index 4678cb8..ed28974 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,5 @@ # Generated by net-scripts for interface eth0 domain profitbricks.localdomain -search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net hennig-berlin.org uhu-banane.de dc252.de.profitbricks.net pbb254.de.profitbricks.net +search profitbricks.localdomain brehm-online.com test.pb-net.com dc1.de.profitbricks.net hennig-berlin.org uhu-banane.de nameserver 192.168.178.30 -nameserver 192.168.178.89 +nameserver 192.168.178.85