From: Frank Brehm Date: Tue, 23 May 2017 07:27:09 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=2a19c06afc002044b1e3625541a386f3b255f7aa;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common index a77e285..4853ef8 100644 --- a/portage/package.accept_keywords/common +++ b/portage/package.accept_keywords/common @@ -10,6 +10,7 @@ app-misc/ddate ~dev-db/xtrabackup-bin-2.4.6 # ~dev-db/mariadb-10.1.22 ~dev-db/mariadb-10.1.23 +~dev-db/mycli-1.7.1 dev-db/oracle-instantclient ~dev-java/leiningen-bin-2.7.1 diff --git a/resolv.conf b/resolv.conf index 837f528..c34a585 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,5 @@ # Generated by resolvconf -search pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net +search pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net nameserver 217.66.52.10 nameserver 212.91.225.75 options single-request-reopen diff --git a/resolvconf.conf b/resolvconf.conf index 568939b..5c9f04e 100644 --- a/resolvconf.conf +++ b/resolvconf.conf @@ -7,7 +7,7 @@ resolv_conf=/etc/resolv.conf #name_servers=127.0.0.1 name_servers="217.66.52.10 212.91.225.75" -search_domains="pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net" +search_domains="pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net" resolv_conf_options="single-request-reopen" diff --git a/systemd/network/50-static.network b/systemd/network/50-static.network index be511ef..0b0d384 100644 --- a/systemd/network/50-static.network +++ b/systemd/network/50-static.network @@ -6,5 +6,5 @@ Address=192.168.122.149/24 Gateway=192.168.122.1 DNS=217.66.52.10 DNS=212.91.225.75 -Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net +Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net