From 7c4c0e556070e2033a3ba7a5c57be7d54e913404 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 28 Jul 2021 18:30:58 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 4 ++-- resolv.conf | 9 +++++---- .../system/multi-user.target.wants/snap-core-11187.mount | 1 - .../system/multi-user.target.wants/snap-core-11420.mount | 1 + .../snap-pycharm\\x2dcommunity-240.mount" | 1 - .../snap-pycharm\\x2dcommunity-248.mount" | 1 + .../{snap-core-11187.mount => snap-core-11420.mount} | 6 +++--- .../system/snap-pycharm\\x2dcommunity-248.mount" | 6 +++--- 8 files changed, 15 insertions(+), 14 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-core-11187.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-11420.mount delete mode 120000 "systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-240.mount" create mode 120000 "systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-248.mount" rename systemd/system/{snap-core-11187.mount => snap-core-11420.mount} (59%) rename "systemd/system/snap-pycharm\\x2dcommunity-240.mount" => "systemd/system/snap-pycharm\\x2dcommunity-248.mount" (53%) diff --git a/.etckeeper b/.etckeeper index c03c08a..234a25d 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3020,10 +3020,10 @@ maybe chmod 0644 'systemd/system/postfix.service.d/override.conf' maybe chmod 0755 'systemd/system/printer.target.wants' maybe chmod 0755 'systemd/system/remote-fs.target.wants' maybe chmod 0755 'systemd/system/rescue.target.wants' -maybe chmod 0644 'systemd/system/snap-core-11187.mount' maybe chmod 0644 'systemd/system/snap-core-11316.mount' -maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-240.mount' +maybe chmod 0644 'systemd/system/snap-core-11420.mount' maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-244.mount' +maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-248.mount' maybe chmod 0755 'systemd/system/sockets.target.wants' maybe chmod 0755 'systemd/system/sysinit.target.wants' maybe chmod 0755 'systemd/system/timers.target.wants' diff --git a/resolv.conf b/resolv.conf index 9a0c1ae..c3eb8f0 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,6 @@ -search pixelpark.net pixelpark.com pixelpark.de brehm-online.com uhu-banane.net pp-dns.com -nameserver 77.74.232.24 -nameserver 77.74.232.25 -nameserver 93.188.104.82 +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 diff --git a/systemd/system/multi-user.target.wants/snap-core-11187.mount b/systemd/system/multi-user.target.wants/snap-core-11187.mount deleted file mode 120000 index 5c972dc..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-11187.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-11187.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-11420.mount b/systemd/system/multi-user.target.wants/snap-core-11420.mount new file mode 120000 index 0000000..5af2670 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-11420.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-11420.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-240.mount" "b/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-240.mount" deleted file mode 120000 index 9f35494..0000000 --- "a/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-240.mount" +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-pycharm\x2dcommunity-240.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-248.mount" "b/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-248.mount" new file mode 120000 index 0000000..3cecad8 --- /dev/null +++ "b/systemd/system/multi-user.target.wants/snap-pycharm\\x2dcommunity-248.mount" @@ -0,0 +1 @@ +/etc/systemd/system/snap-pycharm\x2dcommunity-248.mount \ No newline at end of file diff --git a/systemd/system/snap-core-11187.mount b/systemd/system/snap-core-11420.mount similarity index 59% rename from systemd/system/snap-core-11187.mount rename to systemd/system/snap-core-11420.mount index dda9339..aa4d09b 100644 --- a/systemd/system/snap-core-11187.mount +++ b/systemd/system/snap-core-11420.mount @@ -1,11 +1,11 @@ [Unit] -Description=Mount unit for core, revision 11187 +Description=Mount unit for core, revision 11420 Before=snapd.service After=zfs-mount.service [Mount] -What=/var/lib/snapd/snaps/core_11187.snap -Where=/snap/core/11187 +What=/var/lib/snapd/snaps/core_11420.snap +Where=/snap/core/11420 Type=squashfs Options=nodev,ro,x-gdu.hide,x-gvfs-hide LazyUnmount=yes diff --git "a/systemd/system/snap-pycharm\\x2dcommunity-240.mount" "b/systemd/system/snap-pycharm\\x2dcommunity-248.mount" similarity index 53% rename from "systemd/system/snap-pycharm\\x2dcommunity-240.mount" rename to "systemd/system/snap-pycharm\\x2dcommunity-248.mount" index 14ed58e..829dfdb 100644 --- "a/systemd/system/snap-pycharm\\x2dcommunity-240.mount" +++ "b/systemd/system/snap-pycharm\\x2dcommunity-248.mount" @@ -1,11 +1,11 @@ [Unit] -Description=Mount unit for pycharm-community, revision 240 +Description=Mount unit for pycharm-community, revision 248 Before=snapd.service After=zfs-mount.service [Mount] -What=/var/lib/snapd/snaps/pycharm-community_240.snap -Where=/snap/pycharm-community/240 +What=/var/lib/snapd/snaps/pycharm-community_248.snap +Where=/snap/pycharm-community/248 Type=squashfs Options=nodev,ro,x-gdu.hide,x-gvfs-hide LazyUnmount=yes -- 2.39.5