saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 6601fa74d6b06a1e40cc8dd46498a96c1adf76dc..d0c0310d818acbded9139098927ab7eea6745351 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2674,9 +2674,9 @@ maybe chmod 0755 'systemd/system/printer.target.wants'
 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-canonical\x2dlivepatch-77.mount'
-maybe chmod 0644 'systemd/system/snap-core-6531.mount'
 maybe chmod 0644 'systemd/system/snap-core-6673.mount'
 maybe chmod 0644 'systemd/system/snap-core-6818.mount'
+maybe chmod 0644 'systemd/system/snap-core-6964.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/sysinit.target.wants'

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 9875274b875c51e063b0d16dd39af9807eda96a9..f5717309150b67199f29839b9a2a9c9dac138279 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -37,3 +37,23 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer HP_LaserJet_M806_17B98C_>
+UUID urn:uuid:2d1ac8ea-0a9b-34bc-50d1-06f810c6153f
+Info 
+Location 
+MakeModel LaserJet M806
+DeviceURI ipp://k2-hp2.local:631/ipp/print
+State Idle
+StateTime 1559038929
+ConfigTime 1559038931
+Type 12372
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>

diff --git a/scalpel/scalpel.conf b/scalpel/scalpel.conf
index cdada67e59cca757e5b5da1d6415919513173513..845e38f8611ec0baffaa7a45d21ad5500a9b7fc7 100644 (file)
--- a/scalpel/scalpel.conf
+++ b/scalpel/scalpel.conf
@@ -165,8 +165,8 @@
 # ADOBE PDF
 #--------------------------------------------------------------------- 
 #
-#      pdf     y       5000000 %PDF  %EOF\x0d  REVERSE
-#      pdf     y       5000000 %PDF  %EOF\x0a  REVERSE
+       pdf     y       5000000 %PDF  %EOF\x0d  REVERSE
+       pdf     y       5000000 %PDF  %EOF\x0a  REVERSE
 #
 #--------------------------------------------------------------------- 
 # AOL (AMERICA ONLINE)

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

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

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

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