saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index fc9ec3f48d360d9f2fd9fb605c7cca9d0e9f8d1b..b8435c2f986bb31bc809ce741c276bc9133be87f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -126,6 +126,7 @@ maybe chmod 0755 'NetworkManager/dnsmasq-shared.d'
 maybe chmod 0755 'NetworkManager/dnsmasq.d'
 maybe chmod 0755 'NetworkManager/system-connections'
 maybe chmod 0600 'NetworkManager/system-connections/VPN-DPX.nmconnection'
+maybe chmod 0600 'NetworkManager/system-connections/br0.nmconnection'
 maybe chmod 0600 'NetworkManager/system-connections/enp3s0.nmconnection'
 maybe chmod 0755 'Nextcloud'
 maybe chmod 0644 'Nextcloud/sync-exclude.lst'
@@ -2932,6 +2933,7 @@ maybe chmod 0755 'request-key.d'
 maybe chmod 0644 'request-key.d/cifs.idmap.conf'
 maybe chmod 0644 'request-key.d/cifs.spnego.conf'
 maybe chmod 0644 'request-key.d/id_resolver.conf'
+maybe chmod 0644 'resolv.conf'
 maybe chmod 0644 'resolv.conf.dpx'
 maybe chmod 0644 'resolv.conf.non-dpx'
 maybe chmod 0755 'resolvconf'

diff --git a/NetworkManager/system-connections/br0.nmconnection b/NetworkManager/system-connections/br0.nmconnection
new file mode 100644 (file)
index 0000000..522a68e
--- /dev/null
+++ b/NetworkManager/system-connections/br0.nmconnection
@@ -0,0 +1,18 @@
+[connection]
+id=br0
+uuid=b7c50416-7eae-4fc0-a041-c39a0ce5e7c3
+type=bridge
+interface-name=br0
+
+[bridge]
+
+[ipv4]
+address1=10.12.11.2/24,10.12.11.254
+dns=10.12.11.254;
+method=manual
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto
+
+[proxy]

diff --git a/resolv.conf b/resolv.conf
deleted file mode 120000 (symlink)
index 697ba64f3c9b7b7db5d650a4e4af0c2dc522cf1c..0000000000000000000000000000000000000000
--- a/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-../run/systemd/resolve/stub-resolv.conf
\ No newline at end of file

diff --git a/resolv.conf b/resolv.conf
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c3eb8f044b0d68768ab957c6e675d3913c3e6caf
--- /dev/null
+++ b/resolv.conf
@@ -0,0 +1,6 @@
+search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de uhu-banane.net
+nameserver 127.0.0.1
+nameserver 1.1.1.1
+nameserver 8.8.8.8
+nameserver 8.8.4.4
+options timeout:1 attempts:2 use-vc