saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index e8c5dc33a94322988ff2039ad1935efb9878c4c2..4c13e6537eeffdae76c1464aa1898c51eb9ed8ec 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3279,8 +3279,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-15419.mount'
 maybe chmod 0644 'systemd/system/snap-core-15511.mount'
+maybe chmod 0644 'systemd/system/snap-core-15925.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2785.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2790.mount'
 maybe chmod 0644 'systemd/system/snap-drawio-183.mount'

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

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

diff --git a/systemd/system/snap-core-15419.mount b/systemd/system/snap-core-15419.mount
deleted file mode 100644 (file)
index 5f6b98c..0000000
--- a/systemd/system/snap-core-15419.mount
+++ /dev/null
@@ -1,16 +0,0 @@
-[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-core-15925.mount b/systemd/system/snap-core-15925.mount
new file mode 100644 (file)
index 0000000..86f0706
--- /dev/null
+++ b/systemd/system/snap-core-15925.mount
@@ -0,0 +1,16 @@
+[Unit]
+Description=Mount unit for core, revision 15925
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
+
+[Mount]
+What=/var/lib/snapd/snaps/core_15925.snap
+Where=/snap/core/15925
+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-core-15419.mount b/systemd/system/snapd.mounts.target.wants/snap-core-15419.mount
deleted file mode 120000 (symlink)
index e644572..0000000
--- a/systemd/system/snapd.mounts.target.wants/snap-core-15419.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core-15419.mount
\ No newline at end of file

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

diff --git a/udev/rules.d/70-snap.drawio.rules b/udev/rules.d/70-snap.drawio.rules
index fedf986a27e6fd4387a870293b42693130639e55..d8415942a14044669d0ce3ec6e13e56376c7e108 100644 (file)
--- a/udev/rules.d/70-snap.drawio.rules
+++ b/udev/rules.d/70-snap.drawio.rules
@@ -22,5 +22,9 @@ KERNEL=="vchiq", TAG+="snap_drawio_drawio"
 # opengl
 KERNEL=="vcsm-cma", TAG+="snap_drawio_drawio"
 # opengl
+SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", TAG+="snap_drawio_drawio"
+# opengl
+SUBSYSTEM=="dma_heap", KERNEL=="system", TAG+="snap_drawio_drawio"
+# opengl
 SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="snap_drawio_drawio"
-TAG=="snap_drawio_drawio", RUN+="/usr/lib/snapd/snap-device-helper $env{ACTION} snap_drawio_drawio $devpath $major:$minor"
+TAG=="snap_drawio_drawio", SUBSYSTEM!="module", SUBSYSTEM!="subsystem", RUN+="/usr/lib/snapd/snap-device-helper $env{ACTION} snap_drawio_drawio $devpath $major:$minor"

diff --git a/udev/rules.d/70-snap.ferdi.rules b/udev/rules.d/70-snap.ferdi.rules
index 75525d16f26f8920e663ccc6fe50ca41c2cccf2f..f44bbb4debc46e94c57bd4c05d69ab2d779aa179 100644 (file)
--- a/udev/rules.d/70-snap.ferdi.rules
+++ b/udev/rules.d/70-snap.ferdi.rules
@@ -22,5 +22,9 @@ KERNEL=="vchiq", TAG+="snap_ferdi_ferdi"
 # opengl
 KERNEL=="vcsm-cma", TAG+="snap_ferdi_ferdi"
 # opengl
+SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", TAG+="snap_ferdi_ferdi"
+# opengl
+SUBSYSTEM=="dma_heap", KERNEL=="system", TAG+="snap_ferdi_ferdi"
+# opengl
 SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="snap_ferdi_ferdi"
-TAG=="snap_ferdi_ferdi", RUN+="/usr/lib/snapd/snap-device-helper $env{ACTION} snap_ferdi_ferdi $devpath $major:$minor"
+TAG=="snap_ferdi_ferdi", SUBSYSTEM!="module", SUBSYSTEM!="subsystem", RUN+="/usr/lib/snapd/snap-device-helper $env{ACTION} snap_ferdi_ferdi $devpath $major:$minor"