saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index d561c710426c18a5d9a6ee1297970a5e2598363f..dc1411f52d206aa34b0a1ec14d2524a06f5a4ab6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2665,9 +2665,9 @@ 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-canonical\x2dlivepatch-54.mount'
-maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-58.mount'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-69.mount'
+maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-71.mount'
+maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-74.mount'
 maybe chmod 0644 'systemd/system/snap-core-6405.mount'
 maybe chmod 0644 'systemd/system/snap-core-6531.mount'
 maybe chmod 0644 'systemd/system/snap-core-6673.mount'

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

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

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

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

diff --git a/systemd/system/snap-canonical\x2dlivepatch-54.mount b/systemd/system/snap-canonical\x2dlivepatch-54.mount
deleted file mode 100644 (file)
index 69faab4..0000000
--- a/systemd/system/snap-canonical\x2dlivepatch-54.mount
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mount unit for canonical-livepatch, revision 54
-Before=snapd.service
-
-[Mount]
-What=/var/lib/snapd/snaps/canonical-livepatch_54.snap
-Where=/snap/canonical-livepatch/54
-Type=squashfs
-Options=nodev,ro,x-gdu.hide
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/system/snap-canonical\x2dlivepatch-58.mount b/systemd/system/snap-canonical\x2dlivepatch-58.mount
deleted file mode 100644 (file)
index e6dbdc6..0000000
--- a/systemd/system/snap-canonical\x2dlivepatch-58.mount
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mount unit for canonical-livepatch, revision 58
-Before=snapd.service
-
-[Mount]
-What=/var/lib/snapd/snaps/canonical-livepatch_58.snap
-Where=/snap/canonical-livepatch/58
-Type=squashfs
-Options=nodev,ro,x-gdu.hide
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/system/snap-canonical\x2dlivepatch-71.mount b/systemd/system/snap-canonical\x2dlivepatch-71.mount
new file mode 100644 (file)
index 0000000..016bd4c
--- /dev/null
+++ b/systemd/system/snap-canonical\x2dlivepatch-71.mount
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount unit for canonical-livepatch, revision 71
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/canonical-livepatch_71.snap
+Where=/snap/canonical-livepatch/71
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/system/snap-canonical\x2dlivepatch-74.mount b/systemd/system/snap-canonical\x2dlivepatch-74.mount
new file mode 100644 (file)
index 0000000..57385ce
--- /dev/null
+++ b/systemd/system/snap-canonical\x2dlivepatch-74.mount
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount unit for canonical-livepatch, revision 74
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/canonical-livepatch_74.snap
+Where=/snap/canonical-livepatch/74
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+
+[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 3e1eb2715c188228eddbc410192300aab58081dc..25eac5ea7d062abd0cf046c73c9d4904ad4e32f7 100644 (file)
--- 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-69.mount
+Requires=snap-canonical\x2dlivepatch-74.mount
 Wants=network.target
-After=snap-canonical\x2dlivepatch-69.mount network.target
+After=snap-canonical\x2dlivepatch-74.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/69
+WorkingDirectory=/var/snap/canonical-livepatch/74
 TimeoutStopSec=30
 Type=simple