From 9d68022b58b3b1c94388ec24b4a6bec5cd39e342 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 May 2019 06:42:43 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 +- cups/printers.conf.O | 20 +++++++++++++++++++ scalpel/scalpel.conf | 4 ++-- .../snap-core-6531.mount | 1 - .../snap-core-6964.mount | 1 + ...p-core-6531.mount => snap-core-6964.mount} | 6 +++--- 6 files changed, 27 insertions(+), 7 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-core-6531.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-6964.mount rename systemd/system/{snap-core-6531.mount => snap-core-6964.mount} (51%) diff --git a/.etckeeper b/.etckeeper index 6601fa7..d0c0310 100755 --- 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 9875274..f571730 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -37,3 +37,23 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job + +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 + diff --git a/scalpel/scalpel.conf b/scalpel/scalpel.conf index cdada67..845e38f 100644 --- 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 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 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-6964.mount similarity index 51% rename from systemd/system/snap-core-6531.mount rename to systemd/system/snap-core-6964.mount index 985f2b2..0512fb2 100644 --- a/systemd/system/snap-core-6531.mount +++ b/systemd/system/snap-core-6964.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for core, revision 6531 +Description=Mount unit for core, revision 6964 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/core_6531.snap -Where=/snap/core/6531 +What=/var/lib/snapd/snaps/core_6964.snap +Where=/snap/core/6964 Type=squashfs Options=nodev,ro,x-gdu.hide -- 2.43.0