saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index c1922ad6214ed3310d40ee6b13f09516a4d6cb65..a1fa9712616d25c6a8b521e67edf9cb15ea747a7 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.0.3
-# Written by cupsd on 2016-04-19 11:13
+# Written by cupsd on 2016-04-20 11:12
 NextSubscriptionId 266
 <Subscription 265>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1461143557
+ExpirationTime 1461229897
 NextEventId 1
 </Subscription>

diff --git a/resolv.conf b/resolv.conf
index 9076c0f3da3f4315912ea6570cf46a80418639b3..1602b40a7262146e7c7ddc74ba35c13267ab40b2 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,7 @@
-# Generated by net-scripts for interface eth0
-domain brehm-online.com
-search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
-#nameserver 10.12.11.254
-nameserver 127.0.0.1
+# Hand made by Frank Brehm
+domain home.brehm-online.com
+#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
+search home.brehm-online.com brehm-online.com pb.local stage.pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net
+#nameserver 10.12.11.1
+nameserver 192.168.178.30
+nameserver 192.168.178.89