From 3e1c2f3708393855d9170500e833b2e99bf4074a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Mar 2020 20:04:53 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 4 ++-- .../multi-user.target.wants/snap-atom-245.mount | 1 - .../multi-user.target.wants/snap-atom-248.mount | 1 + .../snap-canonical\\x2dlivepatch-90.mount" | 1 - .../snap-canonical\\x2dlivepatch-95.mount" | 1 + .../{snap-atom-245.mount => snap-atom-248.mount} | 6 +++--- .../system/snap-canonical\\x2dlivepatch-90.mount" | 13 ------------- .../system/snap-canonical\\x2dlivepatch-95.mount" | 13 +++++++++++++ ...canonical-livepatch.canonical-livepatchd.service | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-atom-245.mount create mode 120000 systemd/system/multi-user.target.wants/snap-atom-248.mount delete mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-90.mount" create mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-95.mount" rename systemd/system/{snap-atom-245.mount => snap-atom-248.mount} (55%) delete mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-90.mount" create mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-95.mount" diff --git a/.etckeeper b/.etckeeper index 3c434d8..58db51a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3139,10 +3139,10 @@ 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-245.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-atom-248.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-94.mount' +maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-95.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' diff --git a/systemd/system/multi-user.target.wants/snap-atom-245.mount b/systemd/system/multi-user.target.wants/snap-atom-245.mount deleted file mode 120000 index f2fe8fd..0000000 --- a/systemd/system/multi-user.target.wants/snap-atom-245.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-atom-245.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-atom-248.mount b/systemd/system/multi-user.target.wants/snap-atom-248.mount new file mode 120000 index 0000000..821b31a --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-atom-248.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-atom-248.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-90.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-90.mount" deleted file mode 120000 index e19181d..0000000 --- "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-90.mount" +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-canonical\x2dlivepatch-90.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-95.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-95.mount" new file mode 120000 index 0000000..bf59e1d --- /dev/null +++ "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-95.mount" @@ -0,0 +1 @@ +/etc/systemd/system/snap-canonical\x2dlivepatch-95.mount \ No newline at end of file diff --git a/systemd/system/snap-atom-245.mount b/systemd/system/snap-atom-248.mount similarity index 55% rename from systemd/system/snap-atom-245.mount rename to systemd/system/snap-atom-248.mount index f043ad3..3e3027c 100644 --- a/systemd/system/snap-atom-245.mount +++ b/systemd/system/snap-atom-248.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for atom, revision 245 +Description=Mount unit for atom, revision 248 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/atom_245.snap -Where=/snap/atom/245 +What=/var/lib/snapd/snaps/atom_248.snap +Where=/snap/atom/248 Type=squashfs Options=nodev,ro,x-gdu.hide LazyUnmount=yes diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-90.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-90.mount" deleted file mode 100644 index fea8563..0000000 --- "a/systemd/system/snap-canonical\\x2dlivepatch-90.mount" +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Mount unit for canonical-livepatch, revision 90 -Before=snapd.service - -[Mount] -What=/var/lib/snapd/snaps/canonical-livepatch_90.snap -Where=/snap/canonical-livepatch/90 -Type=squashfs -Options=nodev,ro,x-gdu.hide -LazyUnmount=yes - -[Install] -WantedBy=multi-user.target diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-95.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-95.mount" new file mode 100644 index 0000000..ccbb1a7 --- /dev/null +++ "b/systemd/system/snap-canonical\\x2dlivepatch-95.mount" @@ -0,0 +1,13 @@ +[Unit] +Description=Mount unit for canonical-livepatch, revision 95 +Before=snapd.service + +[Mount] +What=/var/lib/snapd/snaps/canonical-livepatch_95.snap +Where=/snap/canonical-livepatch/95 +Type=squashfs +Options=nodev,ro,x-gdu.hide +LazyUnmount=yes + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service index f142798..6ef6b66 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-94.mount +Requires=snap-canonical\x2dlivepatch-95.mount Wants=network.target -After=snap-canonical\x2dlivepatch-94.mount network.target +After=snap-canonical\x2dlivepatch-95.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/94 +WorkingDirectory=/var/snap/canonical-livepatch/95 TimeoutStopSec=30 Type=simple -- 2.43.0