saving uncommitted changes in /etc prior to emerge run

diff --git a/bash/bashrc b/bash/bashrc
index 098cd273acee8192ca496efb742963ca31928fea..8f594b53095c46032c3b9836dae1ecac1743d25c 100644 (file)
--- 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 4678cb8a7b004d403a6d21eb79a490dea569f645..ed289749a8ac95ec69509364244460e12dfdfa52 100644 (file)
--- 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