saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 9033976347179b4e78340c95e81fcb17362b24f6..f5c747dcecc90c1f8a445a37e34e566f1ca15d7e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2998,10 +2998,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-236.mount'
 maybe chmod 0644 'systemd/system/snap-atom-238.mount'
-maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-81.mount'
+maybe chmod 0644 'systemd/system/snap-atom-241.mount'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-84.mount'
+maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-88.mount'
 maybe chmod 0644 'systemd/system/snap-core-7713.mount'
 maybe chmod 0644 'systemd/system/snap-core-7917.mount'
 maybe chmod 0644 'systemd/system/snap.canonical-livepatch.canonical-livepatchd.service'

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index afe8ad90414a58e900f566eddc2fce4bc30ec6a6..11a84a22d61d94b4c46700c8dd99645c71aee27d 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -91,30 +91,9 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:73ec2c4f-d9cd-3a53-4c89-7321c7167020
-Info 
-Location 
-MakeModel Color LaserJet MFP M277dw - IPP Everywhere
-DeviceURI ipps://NPI9D0E59.local:443/ipp/print
-State Idle
-StateTime 1571852324
-ConfigTime 1571852330
-Type 4188
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
 <Printer HP_LaserJet_M806_17B98C_>
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065
 Info HP LaserJet M806 [17B98C]
-Location 
 MakeModel LaserJet M806 - IPP Everywhere
 DeviceURI ipp://k2-hp2.local:631/ipp/print
 State Idle

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

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

diff --git a/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-81.mount b/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-81.mount
deleted file mode 120000 (symlink)
index eead111..0000000
--- a/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-81.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-canonical\x2dlivepatch-81.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
new file mode 120000 (symlink)
index 0000000..56e106b
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-88.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-canonical\x2dlivepatch-88.mount
\ No newline at end of file

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

diff --git a/systemd/system/snap-atom-241.mount b/systemd/system/snap-atom-241.mount
new file mode 100644 (file)
index 0000000..d6c9aa7
--- /dev/null
+++ b/systemd/system/snap-atom-241.mount
@@ -0,0 +1,13 @@
+[Unit]
+Description=Mount unit for atom, revision 241
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/atom_241.snap
+Where=/snap/atom/241
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=multi-user.target

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

diff --git a/systemd/system/snap-canonical\x2dlivepatch-88.mount b/systemd/system/snap-canonical\x2dlivepatch-88.mount
new file mode 100644 (file)
index 0000000..b6ad661
--- /dev/null
+++ b/systemd/system/snap-canonical\x2dlivepatch-88.mount
@@ -0,0 +1,13 @@
+[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-livepatch.canonical-livepatchd.service b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service
index c5077cfcdf4db32482f7882deb26afb146252c94..2c30595ade9df02d300e9b79959b69d38dfd6a87 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-84.mount
+Requires=snap-canonical\x2dlivepatch-88.mount
 Wants=network.target
-After=snap-canonical\x2dlivepatch-84.mount network.target
+After=snap-canonical\x2dlivepatch-88.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/84
+WorkingDirectory=/var/snap/canonical-livepatch/88
 TimeoutStopSec=30
 Type=simple