saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 089ca4da2a0e94a46b3cdaa72a29fc45d10f5783..74bea01e3a3725903a52a37cd32d62d4aac25fe2 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3271,8 +3271,8 @@ maybe chmod 0755 'systemd/system/remote-fs.target.wants'
 maybe chmod 0755 'systemd/system/rescue.target.wants'
 maybe chmod 0755 'systemd/system/sleep.target.wants'
 maybe chmod 0644 'systemd/system/snap-bare-5.mount'
-maybe chmod 0644 'systemd/system/snap-core-14784.mount'
 maybe chmod 0644 'systemd/system/snap-core-14946.mount'
+maybe chmod 0644 'systemd/system/snap-core-15419.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2751.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2785.mount'
 maybe chmod 0644 'systemd/system/snap-drawio-178.mount'

diff --git a/systemd/system/multi-user.target.wants/snap-core-14784.mount b/systemd/system/multi-user.target.wants/snap-core-14784.mount
deleted file mode 120000 (symlink)
index e3ce426..0000000
--- a/systemd/system/multi-user.target.wants/snap-core-14784.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core-14784.mount
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/snap-core-15419.mount b/systemd/system/multi-user.target.wants/snap-core-15419.mount
new file mode 120000 (symlink)
index 0000000..e644572
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-core-15419.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core-15419.mount
\ No newline at end of file

diff --git a/systemd/system/snap-bare-5.mount b/systemd/system/snap-bare-5.mount
index e87907892324580aa5c5ab7f93c0695399005a44..82d665d57965f63abd7de218d502801c08e63355 100644 (file)
--- a/systemd/system/snap-bare-5.mount
+++ b/systemd/system/snap-bare-5.mount
@@ -1,7 +1,8 @@
 [Unit]
 Description=Mount unit for bare, revision 5
-Before=snapd.service
-After=zfs-mount.service
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
 
 [Mount]
 What=/var/lib/snapd/snaps/bare_5.snap
@@ -11,4 +12,5 @@ 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/snap-core-14784.mount b/systemd/system/snap-core-14784.mount
deleted file mode 100644 (file)
index 382adbd..0000000
--- a/systemd/system/snap-core-14784.mount
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Mount unit for core, revision 14784
-After=snapd.mounts-pre.target
-Before=snapd.mounts.target
-Before=local-fs.target
-
-[Mount]
-What=/var/lib/snapd/snaps/core_14784.snap
-Where=/snap/core/14784
-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/snap-core-15419.mount b/systemd/system/snap-core-15419.mount
new file mode 100644 (file)
index 0000000..5f6b98c
--- /dev/null
+++ b/systemd/system/snap-core-15419.mount
@@ -0,0 +1,16 @@
+[Unit]
+Description=Mount unit for core, revision 15419
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
+
+[Mount]
+What=/var/lib/snapd/snaps/core_15419.snap
+Where=/snap/core/15419
+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/snap-ferdi-225.mount b/systemd/system/snap-ferdi-225.mount
index 25b2ed653dc6f56392790eceec7e2515836cd674..dc137828fc6347540a0b274c2ddf4c0130c805f2 100644 (file)
--- a/systemd/system/snap-ferdi-225.mount
+++ b/systemd/system/snap-ferdi-225.mount
@@ -1,7 +1,8 @@
 [Unit]
 Description=Mount unit for ferdi, revision 225
-Before=snapd.service
-After=zfs-mount.service
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
 
 [Mount]
 What=/var/lib/snapd/snaps/ferdi_225.snap
@@ -11,4 +12,5 @@ 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/snap-gtk\x2dcommon\x2dthemes-1535.mount b/systemd/system/snap-gtk\x2dcommon\x2dthemes-1535.mount
index 902f16eca270f7bfbb3d3fac2c9ca824702da080..07fe0c127df2073b3d42b6d38339193fc5033b84 100644 (file)
--- a/systemd/system/snap-gtk\x2dcommon\x2dthemes-1535.mount
+++ b/systemd/system/snap-gtk\x2dcommon\x2dthemes-1535.mount
@@ -1,7 +1,8 @@
 [Unit]
 Description=Mount unit for gtk-common-themes, revision 1535
-Before=snapd.service
-After=zfs-mount.service
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
 
 [Mount]
 What=/var/lib/snapd/snaps/gtk-common-themes_1535.snap
@@ -11,4 +12,5 @@ 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-bare-5.mount b/systemd/system/snapd.mounts.target.wants/snap-bare-5.mount
new file mode 120000 (symlink)
index 0000000..34eb1f5
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-bare-5.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-bare-5.mount
\ No newline at end of file

diff --git a/systemd/system/snapd.mounts.target.wants/snap-core-14784.mount b/systemd/system/snapd.mounts.target.wants/snap-core-14784.mount
deleted file mode 120000 (symlink)
index e3ce426..0000000
--- a/systemd/system/snapd.mounts.target.wants/snap-core-14784.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core-14784.mount
\ No newline at end of file

diff --git a/systemd/system/snapd.mounts.target.wants/snap-core-15419.mount b/systemd/system/snapd.mounts.target.wants/snap-core-15419.mount
new file mode 120000 (symlink)
index 0000000..e644572
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-core-15419.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core-15419.mount
\ No newline at end of file

diff --git a/systemd/system/snapd.mounts.target.wants/snap-ferdi-225.mount b/systemd/system/snapd.mounts.target.wants/snap-ferdi-225.mount
new file mode 120000 (symlink)
index 0000000..6189ef4
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-ferdi-225.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-ferdi-225.mount
\ No newline at end of file

diff --git a/systemd/system/snapd.mounts.target.wants/snap-gtk\x2dcommon\x2dthemes-1535.mount b/systemd/system/snapd.mounts.target.wants/snap-gtk\x2dcommon\x2dthemes-1535.mount
new file mode 120000 (symlink)
index 0000000..de03844
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-gtk\x2dcommon\x2dthemes-1535.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-gtk\x2dcommon\x2dthemes-1535.mount
\ No newline at end of file