saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 32f7caa2b71a507aa196ae5213ad0160eccaf931..176320300f27e382fe43d69c1cae27263bb34701 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -198,9 +198,10 @@ maybe chmod 0640 'config-archive/etc/ssmtp/ssmtp.conf'
 maybe chmod 0640 'config-archive/etc/ssmtp/ssmtp.conf.dist.new'
 maybe chmod 0755 'config-archive/etc/systemd'
 maybe chmod 0644 'config-archive/etc/systemd/journald.conf'
+maybe chmod 0644 'config-archive/etc/systemd/journald.conf.1'
 maybe chmod 0644 'config-archive/etc/systemd/journald.conf.dist'
 maybe chmod 0644 'config-archive/etc/systemd/resolved.conf'
-maybe chmod 0644 'config-archive/etc/systemd/resolved.conf.dist.new'
+maybe chmod 0644 'config-archive/etc/systemd/resolved.conf.dist'
 maybe chmod 0755 'cron.d'
 maybe chmod 0644 'cron.d/.keep_sys-process_cronie-0'
 maybe chmod 0755 'cron.daily'

diff --git a/config-archive/etc/systemd/journald.conf b/config-archive/etc/systemd/journald.conf
index 2e344510fae372ea222a037a8e5bc4949cf18ed0..13df9e4d44ed4a2415f263d95e76ddfe430e8847 100644 (file)
--- a/config-archive/etc/systemd/journald.conf
+++ b/config-archive/etc/systemd/journald.conf
@@ -17,14 +17,16 @@
 #Seal=yes
 #SplitMode=uid
 #SyncIntervalSec=5m
-#RateLimitInterval=30s
+#RateLimitIntervalSec=30s
 #RateLimitBurst=1000
 #SystemMaxUse=
 #SystemKeepFree=
 #SystemMaxFileSize=
+#SystemMaxFiles=100
 #RuntimeMaxUse=
 #RuntimeKeepFree=
 #RuntimeMaxFileSize=
+#RuntimeMaxFiles=100
 #MaxRetentionSec=
 #MaxFileSec=1month
 #ForwardToSyslog=no

diff --git a/config-archive/etc/systemd/journald.conf.1 b/config-archive/etc/systemd/journald.conf.1
new file mode 100644 (file)
index 0000000..2e34451
--- /dev/null
+++ b/config-archive/etc/systemd/journald.conf.1
@@ -0,0 +1,40 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See journald.conf(5) for details.
+
+[Journal]
+#Storage=auto
+#Compress=yes
+#Seal=yes
+#SplitMode=uid
+#SyncIntervalSec=5m
+#RateLimitInterval=30s
+#RateLimitBurst=1000
+#SystemMaxUse=
+#SystemKeepFree=
+#SystemMaxFileSize=
+#RuntimeMaxUse=
+#RuntimeKeepFree=
+#RuntimeMaxFileSize=
+#MaxRetentionSec=
+#MaxFileSec=1month
+#ForwardToSyslog=no
+ForwardToSyslog=yes
+#ForwardToKMsg=no
+#ForwardToConsole=no
+#ForwardToWall=yes
+#TTYPath=/dev/console
+#MaxLevelStore=debug
+#MaxLevelSyslog=debug
+#MaxLevelKMsg=notice
+#MaxLevelConsole=info
+#MaxLevelWall=emerg

diff --git a/config-archive/etc/systemd/journald.conf.dist b/config-archive/etc/systemd/journald.conf.dist
index 2541b949be79f95a468d3a1a5df5fab282e54642..03fce40e908707fe2976e4d109176b78b9a482b2 100644 (file)
--- a/config-archive/etc/systemd/journald.conf.dist
+++ b/config-archive/etc/systemd/journald.conf.dist
@@ -39,3 +39,4 @@
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
 #MaxLevelWall=emerg
+#LineMax=48K

diff --git a/config-archive/etc/systemd/resolved.conf.dist b/config-archive/etc/systemd/resolved.conf.dist
new file mode 100644 (file)
index 0000000..cd2c489
--- /dev/null
+++ b/config-archive/etc/systemd/resolved.conf.dist
@@ -0,0 +1,22 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See resolved.conf(5) for details
+
+[Resolve]
+#DNS=
+#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
+#Domains=
+#LLMNR=yes
+#MulticastDNS=yes
+#DNSSEC=allow-downgrade
+#Cache=yes
+#DNSStubListener=udp

diff --git a/config-archive/etc/systemd/resolved.conf.dist.new b/config-archive/etc/systemd/resolved.conf.dist.new
deleted file mode 100644 (file)
index b2340a5..0000000
--- a/config-archive/etc/systemd/resolved.conf.dist.new
+++ /dev/null
@@ -1,21 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
-#
-# See resolved.conf(5) for details
-
-[Resolve]
-#DNS=
-#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
-#Domains=
-#LLMNR=yes
-#DNSSEC=allow-downgrade
-#Cache=yes
-#DNSStubListener=udp

diff --git a/systemd/journald.conf b/systemd/journald.conf
index 13df9e4d44ed4a2415f263d95e76ddfe430e8847..52bb07bc5eeab4f0771c2d76ae65d73a7dcf096b 100644 (file)
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -40,3 +40,4 @@ ForwardToSyslog=yes
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
 #MaxLevelWall=emerg
+#LineMax=48K

diff --git a/systemd/network/50-static.network b/systemd/network/50-static.network
index 0b0d38492e92c05215f50a129a6759dd65b5ea5a..70f19fa6832d64806c2265d22f096b5c93aa15c7 100644 (file)
--- a/systemd/network/50-static.network
+++ b/systemd/network/50-static.network
@@ -8,3 +8,4 @@ DNS=217.66.52.10
 DNS=212.91.225.75
 Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net
 
+# vim: filetype=dosini

diff --git a/systemd/resolved.conf b/systemd/resolved.conf
index 3c923efae2ad978848d04bcfdb1d8d988d1abda7..47c8f3384e02482a0919f390467c1dac95192a15 100644 (file)
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -18,3 +18,7 @@
 DNS=217.66.52.10 212.91.225.75
 #Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net
 
+#MulticastDNS=yes
+#DNSSEC=allow-downgrade
+#Cache=yes
+#DNSStubListener=udp