saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index f4ad4310ef375615607d026e51d8e7d7465141bd..7cce2b51a94a47e6753ceed2cdf6b546d578f488 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3216,8 +3216,8 @@ 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-250.mount'
 maybe chmod 0644 'systemd/system/snap-atom-252.mount'
+maybe chmod 0644 'systemd/system/snap-atom-257.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-9066.mount'

diff --git a/cron.daily/borgbackup b/cron.daily/borgbackup
index 89f9ed4f08d0455d5a250253508cf6dddbda68b1..c56a2db2750de83349cc2d07ecd902b13fa882d1 100755 (executable)
--- a/cron.daily/borgbackup
+++ b/cron.daily/borgbackup
@@ -1,2 +1,2 @@
 #!/bin/bash
-/usr/bin/borgbackup.sh
+/usr/bin/borgbackup.sh >> /var/log/borgbackup.log

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index b7881dafa992085b8fec064766dcf22fd76525bd..0adc749ca306543f970420fd199a4d4e0972fe60 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 48
+NextPrinterId 51
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -118,6 +118,27 @@ OpPolicy default
 ErrorPolicy retry-job
 Option cups-browsed true
 </Printer>
+<Printer hp_LaserJet_9040_8BFB3E_>
+PrinterId 49
+UUID urn:uuid:c2198c84-8111-3afb-770a-fd6643c51230
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
+State Idle
+StateTime 1592287108
+ConfigTime 1592287108
+Type 8400988
+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_>
 PrinterId 7
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065

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

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

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

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