saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index a77e28597c26ffdf773f76a0866f7cc7baef6a4b..4853ef8c011c467620c4aee0cb4a5304bce93755 100644 (file)
--- 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 837f52876118ac24aee03037d7bd055141d3c434..c34a585d09963197e7842596874c8fbf103b93c3 100644 (file)
--- 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 568939bf831024e18fc00444debb6af2fb0f8afa..5c9f04efc7313b7c4e84cb34819cbb0c4d9162eb 100644 (file)
--- 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 be511efebd06ade78e64393911b1b6d0b5377825..0b0d38492e92c05215f50a129a6759dd65b5ea5a 100644 (file)
--- 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