From: Frank Brehm Date: Mon, 2 May 2016 11:56:53 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6184bb1c9e3ed3e07016a905d1448e45822a47d2;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/portage/package.keywords/common b/portage/package.keywords/common index b98e2e0..2d69038 100644 --- 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 049b19a..2291281 100644 --- 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