From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 16 Jun 2014 22:28:21 +0000 (+0200)
Subject: Current state
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=400a1bb8371a5a3187286eecabde096876b78916;p=config%2Fbruni%2Fetc.git

Current state
---

diff --git a/conf.d/net b/conf.d/net
index 55ade134..cec782b3 100644
--- a/conf.d/net
+++ b/conf.d/net
@@ -4,6 +4,7 @@
 # in /etc/conf.d/net (this file :]!).
 
 #modules_eth1=( "dhcpcd" )
+modules_eth0=( "dhclient" )
 #config_eth1=( "dhcp" )
 #dhcp_eth1="release nodns nontp nonis"
 
@@ -11,12 +12,22 @@
 #routes_eth0=( "default via 10.12.11.1" );
 
 #config_eth0="10.12.11.2/24 2001:6f8:1db7::1/64"
-config_eth0="10.12.11.2/24"
-routes_eth0="default via 10.12.11.254"
+config_eth0="10.12.11.2/24 2a02:8109:9300:488:5604:a6ff:fe38:99f9/64"
+routes_eth0="default via 10.12.11.254
+default via 2a02:8109:9300:488:a96:d7ff:fe55:4821"
+#config_eth0="dhcp"
+#dhcp_eth0="release nodns nontp nonis"
+fallback_eth0="apipa"
 
-dns_domain_eth0="brehm-online.com"
-dns_servers_eth0="10.12.11.254"
-dns_search_eth0="home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de"
+#dns_domain_eth0="brehm-online.com"
+#dns_servers_eth0="10.12.11.254"
+#dns_search_eth0="home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de"
+
+#postup() {
+#    if [ "${IFACE}" = "eth0" ] ; then
+#        dhclient -6 eth0
+#    fi
+#}
 
 # The network scripts are now part of net-misc/netifrc
 # In order to avoid sys-apps/openrc-0.12.4 from removing this file, this comment was
diff --git a/cups/printers.conf b/cups/printers.conf
index ba758cd7..3a130b31 100644
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-05-23 07:47
+# Written by cupsd on 2014-06-17 00:25
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
diff --git a/dhcp/dhclient.conf b/dhcp/dhclient.conf
index f8b6dd4c..612424e0 100644
--- a/dhcp/dhclient.conf
+++ b/dhcp/dhclient.conf
@@ -13,6 +13,8 @@
 #media "-link0 -link1 -link2", "link0 link1";
 #reject 192.33.137.209;
 
+supersede domain-search "home.brehm-online.com" "brehm-online.com" "uhu-banane.de";
+
 #alias {
 #  interface "ep0";
 #  fixed-address 192.5.5.213;
@@ -31,3 +33,7 @@
 #  rebind 2 2000/1/12 00:00:01;
 #  expire 2 2000/1/12 00:00:01;
 #}
+
+interface "eth0" {
+	supersede domain-search "home.brehm-online.com" "brehm-online.com" "uhu-banane.de";
+}