saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index b98e2e066f70079a2e47f0cd1a0023e3fa950b97..2d690385d89cda766900f63a40e951556d5c0b87 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -101,6 +101,7 @@ dev-python/pb-logging
 ~dev-python/pycryptopp-0.6.0
 #~dev-python/py-notify-0.3.1
 ~dev-python/pyparted-3.10.2
+~dev-python/pytest-pythonpath-0.7
 #~dev-python/python-debian-0.1.21
 ~dev-python/python-debian-0.1.21_p2
 ~dev-python/python-debian-0.1.27

diff --git a/resolv.conf b/resolv.conf
index 049b19a665b9f2993347506d48cd4b6c0deee6b3..22912810f4df1293665b4d061d2686a6bd488c10 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,5 @@
 # Generated by net-scripts for interface eth0
 domain pb.local
-search pb.local stage.pb.local stg.profitbricks.net brehm-online.com uhu-banane.de
+search stage.pb.local pb.local stg.profitbricks.net brehm-online.com uhu-banane.de
 nameserver 192.168.178.30
 nameserver 192.168.178.89