From 6f711aa928b3b978b13eb9161af55b25902f7d58 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 25 Aug 2023 09:02:31 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 +- .../system/multi-user.target.wants/snap-core-15419.mount | 1 - .../system/multi-user.target.wants/snap-core-15925.mount | 1 + .../system/{snap-core-15419.mount => snap-core-15925.mount} | 6 +++--- .../system/snapd.mounts.target.wants/snap-core-15419.mount | 1 - .../system/snapd.mounts.target.wants/snap-core-15925.mount | 1 + udev/rules.d/70-snap.drawio.rules | 6 +++++- udev/rules.d/70-snap.ferdi.rules | 6 +++++- 8 files changed, 16 insertions(+), 8 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-core-15419.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-15925.mount rename systemd/system/{snap-core-15419.mount => snap-core-15925.mount} (67%) delete mode 120000 systemd/system/snapd.mounts.target.wants/snap-core-15419.mount create mode 120000 systemd/system/snapd.mounts.target.wants/snap-core-15925.mount diff --git a/.etckeeper b/.etckeeper index e8c5dc3..4c13e65 100755 --- 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 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 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-15925.mount similarity index 67% rename from systemd/system/snap-core-15419.mount rename to systemd/system/snap-core-15925.mount index 5f6b98c..86f0706 100644 --- a/systemd/system/snap-core-15419.mount +++ b/systemd/system/snap-core-15925.mount @@ -1,12 +1,12 @@ [Unit] -Description=Mount unit for core, revision 15419 +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_15419.snap -Where=/snap/core/15419 +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 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 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 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 fedf986..d841594 100644 --- 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 75525d1..f44bbb4 100644 --- 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" -- 2.39.5