From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Tue, 12 Mar 2013 10:30:42 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a77b0549b2515d9520bf5aa0b6d32b2f571d511c;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/gconf/gconf.xml.system/%gconf-tree.xml b/gconf/gconf.xml.system/%gconf-tree.xml
new file mode 100644
index 0000000..ecd3b90
--- /dev/null
+++ b/gconf/gconf.xml.system/%gconf-tree.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<gconf>
+	<dir name="apps">
+		<dir name="gnome-power-manager">
+			<dir name="buttons">
+				<entry name="lid_ac" mtime="1363026470" type="string">
+					<stringvalue>suspend</stringvalue>
+				</entry>
+				<entry name="suspend" mtime="1363026470" type="string">
+					<stringvalue>suspend</stringvalue>
+				</entry>
+				<entry name="power" mtime="1363026470" type="string">
+					<stringvalue>interactive</stringvalue>
+				</entry>
+			</dir>
+			<dir name="timeout">
+				<entry name="sleep_display_ac" mtime="1363026470" type="int" value="3600"/>
+			</dir>
+			<dir name="backlight">
+				<entry name="idle_dim_ac" mtime="1363026470" type="bool" value="false"/>
+			</dir>
+		</dir>
+	</dir>
+</gconf>
diff --git a/resolv.conf b/resolv.conf
index e2a8cbf..77f917d 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,7 +1,5 @@
-# Generated by dhcpcd from eth0
-# /etc/resolv.conf.head can replace this line
+# Generated by net-scripts for interface eth0
 domain pb.local
-search pb.local
+search pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
 nameserver 192.168.178.30
 nameserver 192.168.178.89
-# /etc/resolv.conf.tail can replace this line