From 80e208e5a5ae83d9499b5a6d2e69a368dd90a65d Mon Sep 17 00:00:00 2001
From: root <root@bruni.home.brehm-online.com>
Date: Sat, 18 Feb 2023 11:29:27 +0100
Subject: [PATCH] daily autocommit

---
 .etckeeper                                       |  2 +-
 .../default.target.wants/snap-core18-2667.mount  |  1 -
 .../snap-core18-2667.mount                       |  1 -
 .../snap-core18-2697.mount                       |  1 +
 systemd/system/snap-core18-2667.mount            | 14 --------------
 systemd/system/snap-core18-2697.mount            | 16 ++++++++++++++++
 .../snap-core18-2697.mount                       |  1 +
 7 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 120000 systemd/system/default.target.wants/snap-core18-2667.mount
 delete mode 120000 systemd/system/multi-user.target.wants/snap-core18-2667.mount
 create mode 120000 systemd/system/multi-user.target.wants/snap-core18-2697.mount
 delete mode 100644 systemd/system/snap-core18-2667.mount
 create mode 100644 systemd/system/snap-core18-2697.mount
 create mode 120000 systemd/system/snapd.mounts.target.wants/snap-core18-2697.mount

diff --git a/.etckeeper b/.etckeeper
index b656a8b..6231fbc 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3275,8 +3275,8 @@ maybe chmod 0755 'systemd/system/sleep.target.wants'
 maybe chmod 0644 'systemd/system/snap-bare-5.mount'
 maybe chmod 0644 'systemd/system/snap-core-14447.mount'
 maybe chmod 0644 'systemd/system/snap-core-14784.mount'
-maybe chmod 0644 'systemd/system/snap-core18-2667.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2679.mount'
+maybe chmod 0644 'systemd/system/snap-core18-2697.mount'
 maybe chmod 0644 'systemd/system/snap-drawio-170.mount'
 maybe chmod 0644 'systemd/system/snap-drawio-171.mount'
 maybe chmod 0644 'systemd/system/snap-ferdi-211.mount'
diff --git a/systemd/system/default.target.wants/snap-core18-2667.mount b/systemd/system/default.target.wants/snap-core18-2667.mount
deleted file mode 120000
index 655ee42..0000000
--- a/systemd/system/default.target.wants/snap-core18-2667.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core18-2667.mount
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/snap-core18-2667.mount b/systemd/system/multi-user.target.wants/snap-core18-2667.mount
deleted file mode 120000
index 655ee42..0000000
--- a/systemd/system/multi-user.target.wants/snap-core18-2667.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core18-2667.mount
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/snap-core18-2697.mount b/systemd/system/multi-user.target.wants/snap-core18-2697.mount
new file mode 120000
index 0000000..cd5c192
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-core18-2697.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core18-2697.mount
\ No newline at end of file
diff --git a/systemd/system/snap-core18-2667.mount b/systemd/system/snap-core18-2667.mount
deleted file mode 100644
index 070b9f5..0000000
--- a/systemd/system/snap-core18-2667.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mount unit for core18, revision 2667
-Before=snapd.service
-After=zfs-mount.service
-
-[Mount]
-What=/var/lib/snapd/snaps/core18_2667.snap
-Where=/snap/core18/2667
-Type=squashfs
-Options=nodev,ro,x-gdu.hide,x-gvfs-hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=default.target multi-user.target
diff --git a/systemd/system/snap-core18-2697.mount b/systemd/system/snap-core18-2697.mount
new file mode 100644
index 0000000..5d5be47
--- /dev/null
+++ b/systemd/system/snap-core18-2697.mount
@@ -0,0 +1,16 @@
+[Unit]
+Description=Mount unit for core18, revision 2697
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
+
+[Mount]
+What=/var/lib/snapd/snaps/core18_2697.snap
+Where=/snap/core18/2697
+Type=squashfs
+Options=nodev,ro,x-gdu.hide,x-gvfs-hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=snapd.mounts.target
+WantedBy=multi-user.target
diff --git a/systemd/system/snapd.mounts.target.wants/snap-core18-2697.mount b/systemd/system/snapd.mounts.target.wants/snap-core18-2697.mount
new file mode 120000
index 0000000..cd5c192
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-core18-2697.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core18-2697.mount
\ No newline at end of file
-- 
2.39.5