From fcd789ff1733db83eab0490108df946afee27950 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 20 Jun 2023 23:25:04 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 +- .../system/multi-user.target.wants/snap-core-14784.mount | 1 - .../system/multi-user.target.wants/snap-core-15419.mount | 1 + systemd/system/snap-bare-5.mount | 6 ++++-- .../system/{snap-core-14784.mount => snap-core-15419.mount} | 6 +++--- systemd/system/snap-ferdi-225.mount | 6 ++++-- "systemd/system/snap-gtk\\x2dcommon\\x2dthemes-1535.mount" | 6 ++++-- systemd/system/snapd.mounts.target.wants/snap-bare-5.mount | 1 + .../system/snapd.mounts.target.wants/snap-core-14784.mount | 1 - .../system/snapd.mounts.target.wants/snap-core-15419.mount | 1 + .../system/snapd.mounts.target.wants/snap-ferdi-225.mount | 1 + .../snap-gtk\\x2dcommon\\x2dthemes-1535.mount" | 1 + 12 files changed, 21 insertions(+), 12 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-core-14784.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-15419.mount rename systemd/system/{snap-core-14784.mount => snap-core-15419.mount} (67%) create mode 120000 systemd/system/snapd.mounts.target.wants/snap-bare-5.mount delete mode 120000 systemd/system/snapd.mounts.target.wants/snap-core-14784.mount create mode 120000 systemd/system/snapd.mounts.target.wants/snap-core-15419.mount create mode 120000 systemd/system/snapd.mounts.target.wants/snap-ferdi-225.mount create mode 120000 "systemd/system/snapd.mounts.target.wants/snap-gtk\\x2dcommon\\x2dthemes-1535.mount" diff --git a/.etckeeper b/.etckeeper index 089ca4d..74bea01 100755 --- 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 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 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 e879078..82d665d 100644 --- 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-15419.mount similarity index 67% rename from systemd/system/snap-core-14784.mount rename to systemd/system/snap-core-15419.mount index 382adbd..5f6b98c 100644 --- a/systemd/system/snap-core-14784.mount +++ b/systemd/system/snap-core-15419.mount @@ -1,12 +1,12 @@ [Unit] -Description=Mount unit for core, revision 14784 +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_14784.snap -Where=/snap/core/14784 +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 diff --git a/systemd/system/snap-ferdi-225.mount b/systemd/system/snap-ferdi-225.mount index 25b2ed6..dc13782 100644 --- 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 902f16e..07fe0c1 100644 --- "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 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 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 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 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 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 -- 2.39.5