From: Frank Brehm Date: Wed, 28 Oct 2015 21:21:42 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=58e76405b41a2f131147702b35c080d80c4fb571;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/resolv.conf b/resolv.conf index 8a53d6bf..7a104c01 100644 --- 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 uhu-banane.de 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