From ac44993a21252497a67d7b5b4cf9ee319be588dd Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 Mar 2020 06:43:41 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 6 +++--- .../multi-user.target.wants/snap-atom-242.mount | 1 - .../multi-user.target.wants/snap-atom-247.mount | 1 + .../snap-canonical\\x2dlivepatch-88.mount" | 1 - .../snap-canonical\\x2dlivepatch-94.mount" | 1 + .../multi-user.target.wants/snap-core-8213.mount | 1 - .../multi-user.target.wants/snap-core-8689.mount | 1 + .../{snap-atom-242.mount => snap-atom-247.mount} | 6 +++--- .../system/snap-canonical\\x2dlivepatch-88.mount" | 13 ------------- .../system/snap-canonical\\x2dlivepatch-94.mount" | 13 +++++++++++++ .../{snap-core-8213.mount => snap-core-8689.mount} | 6 +++--- ...canonical-livepatch.canonical-livepatchd.service | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-atom-242.mount create mode 120000 systemd/system/multi-user.target.wants/snap-atom-247.mount delete mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-88.mount" create mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-94.mount" delete mode 120000 systemd/system/multi-user.target.wants/snap-core-8213.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-8689.mount rename systemd/system/{snap-atom-242.mount => snap-atom-247.mount} (55%) delete mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-88.mount" create mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-94.mount" rename systemd/system/{snap-core-8213.mount => snap-core-8689.mount} (54%) diff --git a/.etckeeper b/.etckeeper index 8aeffb6..3c434d8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3139,12 +3139,12 @@ maybe chmod 0755 'systemd/system/network-pre.target.wants' maybe chmod 0755 'systemd/system/oem-config.service.wants' maybe chmod 0755 'systemd/system/paths.target.wants' maybe chmod 0755 'systemd/system/printer.target.wants' -maybe chmod 0644 'systemd/system/snap-atom-242.mount' maybe chmod 0644 'systemd/system/snap-atom-245.mount' -maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-88.mount' +maybe chmod 0644 'systemd/system/snap-atom-247.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-90.mount' -maybe chmod 0644 'systemd/system/snap-core-8213.mount' +maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-94.mount' maybe chmod 0644 'systemd/system/snap-core-8268.mount' +maybe chmod 0644 'systemd/system/snap-core-8689.mount' maybe chmod 0644 'systemd/system/snap.canonical-livepatch.canonical-livepatchd.service' maybe chmod 0755 'systemd/system/sockets.target.wants' maybe chmod 0755 'systemd/system/spice-vdagentd.target.wants' diff --git a/systemd/system/multi-user.target.wants/snap-atom-242.mount b/systemd/system/multi-user.target.wants/snap-atom-242.mount deleted file mode 120000 index b0d7bf5..0000000 --- a/systemd/system/multi-user.target.wants/snap-atom-242.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-atom-242.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-atom-247.mount b/systemd/system/multi-user.target.wants/snap-atom-247.mount new file mode 120000 index 0000000..1314be4 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-atom-247.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-atom-247.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-88.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-88.mount" deleted file mode 120000 index 56e106b..0000000 --- "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-88.mount" +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-canonical\x2dlivepatch-88.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-94.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-94.mount" new file mode 120000 index 0000000..64dd638 --- /dev/null +++ "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-94.mount" @@ -0,0 +1 @@ +/etc/systemd/system/snap-canonical\x2dlivepatch-94.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-8213.mount b/systemd/system/multi-user.target.wants/snap-core-8213.mount deleted file mode 120000 index 7d8b795..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-8213.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-8213.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-8689.mount b/systemd/system/multi-user.target.wants/snap-core-8689.mount new file mode 120000 index 0000000..e1d0ea3 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-8689.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-8689.mount \ No newline at end of file diff --git a/systemd/system/snap-atom-242.mount b/systemd/system/snap-atom-247.mount similarity index 55% rename from systemd/system/snap-atom-242.mount rename to systemd/system/snap-atom-247.mount index 852207a..f013bbf 100644 --- a/systemd/system/snap-atom-242.mount +++ b/systemd/system/snap-atom-247.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for atom, revision 242 +Description=Mount unit for atom, revision 247 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/atom_242.snap -Where=/snap/atom/242 +What=/var/lib/snapd/snaps/atom_247.snap +Where=/snap/atom/247 Type=squashfs Options=nodev,ro,x-gdu.hide LazyUnmount=yes diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-88.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-88.mount" deleted file mode 100644 index b6ad661..0000000 --- "a/systemd/system/snap-canonical\\x2dlivepatch-88.mount" +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Mount unit for canonical-livepatch, revision 88 -Before=snapd.service - -[Mount] -What=/var/lib/snapd/snaps/canonical-livepatch_88.snap -Where=/snap/canonical-livepatch/88 -Type=squashfs -Options=nodev,ro,x-gdu.hide -LazyUnmount=yes - -[Install] -WantedBy=multi-user.target diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-94.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-94.mount" new file mode 100644 index 0000000..99287a9 --- /dev/null +++ "b/systemd/system/snap-canonical\\x2dlivepatch-94.mount" @@ -0,0 +1,13 @@ +[Unit] +Description=Mount unit for canonical-livepatch, revision 94 +Before=snapd.service + +[Mount] +What=/var/lib/snapd/snaps/canonical-livepatch_94.snap +Where=/snap/canonical-livepatch/94 +Type=squashfs +Options=nodev,ro,x-gdu.hide +LazyUnmount=yes + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/snap-core-8213.mount b/systemd/system/snap-core-8689.mount similarity index 54% rename from systemd/system/snap-core-8213.mount rename to systemd/system/snap-core-8689.mount index 0ba2674..ad266f0 100644 --- a/systemd/system/snap-core-8213.mount +++ b/systemd/system/snap-core-8689.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for core, revision 8213 +Description=Mount unit for core, revision 8689 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/core_8213.snap -Where=/snap/core/8213 +What=/var/lib/snapd/snaps/core_8689.snap +Where=/snap/core/8689 Type=squashfs Options=nodev,ro,x-gdu.hide LazyUnmount=yes diff --git a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service index 9e034fd..f142798 100644 --- a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service +++ b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service @@ -1,16 +1,16 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application canonical-livepatch.canonical-livepatchd -Requires=snap-canonical\x2dlivepatch-90.mount +Requires=snap-canonical\x2dlivepatch-94.mount Wants=network.target -After=snap-canonical\x2dlivepatch-90.mount network.target +After=snap-canonical\x2dlivepatch-94.mount network.target X-Snappy=yes [Service] ExecStart=/usr/bin/snap run canonical-livepatch.canonical-livepatchd SyslogIdentifier=canonical-livepatch.canonical-livepatchd Restart=on-failure -WorkingDirectory=/var/snap/canonical-livepatch/90 +WorkingDirectory=/var/snap/canonical-livepatch/94 TimeoutStopSec=30 Type=simple -- 2.43.0