saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 78701ba0923681ee6e92c6ee6f44b419579c5eca..0cd03b82301e4ee9f8583a1319343585d61e8388 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1177,8 +1177,6 @@ maybe chgrp 'lp' 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd'
 maybe chmod 0640 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd'
 maybe chgrp 'lp' 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O'
 maybe chmod 0640 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O'
-maybe chgrp 'lp' 'cups/ppd/TEST_linux_a5xv.ppd'
-maybe chmod 0640 'cups/ppd/TEST_linux_a5xv.ppd'
 maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
 maybe chgrp 'lp' 'cups/printers.conf.O'
@@ -2657,9 +2655,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-50.mount'
 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-core-6405.mount'
 maybe chmod 0644 'systemd/system/snap-core-6531.mount'
 maybe chmod 0644 'systemd/system/snap-core-6673.mount'

diff --git a/cups/ppd/TEST_linux_a5xv.ppd b/cups/ppd/TEST_linux_a5xv.ppd
deleted file mode 100644 (file)
index 28e312e..0000000
--- a/cups/ppd/TEST_linux_a5xv.ppd
+++ /dev/null
@@ -1,163 +0,0 @@
-*PPD-Adobe: "4.3"
-*%
-*% "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $"
-*%
-*%   Sample Postscript driver PPD file for the Common UNIX Printing
-*%   System (CUPS).
-*%
-*%   Michael Goffioul <goffioul@emic.ucl.ac.be>
-*%
-*APRemoteQueueID: ""
-*FormatVersion:        "4.3"
-*FileVersion:  "1.1"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PCFileName:   "PSTSCRPT.PPD"
-*Manufacturer: "Postscript"
-*Product:      "(CUPS v1.1)"
-*ModelName:     "Generic postscript printer"
-*ShortNickName: "Generic postscript printer"
-*NickName:      "Remote printer: Generic postscript printer"
-*PSVersion:    "(2017.000) 0"
-*LanguageLevel:        "2"
-*ColorDevice:  False
-*DefaultColorSpace: Gray
-*FileSystem:   False
-*Throughput:   "8"
-*LandscapeOrientation: Plus90
-*VariablePaperSize: False
-*TTRasterizer: Type42
-
-*UIConstraints: *PageSize Executive *InputSlot Manual
-*UIConstraints: *PageSize Letter *InputSlot Manual
-*UIConstraints: *PageSize Legal *InputSlot Manual
-*UIConstraints: *PageSize A4 *InputSlot Manual
-*UIConstraints: *PageSize A5 *InputSlot Manual
-*UIConstraints: *PageSize B5 *InputSlot Manual
-
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: Letter
-*PageSize Letter/Letter:       "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal:         "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4:               "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
-*PageSize A5/A5:               "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
-*PageSize B5/B5 (JIS):         "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-*PageSize Env10/Envelope #10:  "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
-*PageSize EnvC5/Envelope C5:   "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-*PageSize EnvDL/Envelope DL:   "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
-*CloseUI: *PageSize
-
-*OpenUI *PageRegion: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/Letter:     "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal:       "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4:             "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
-*PageRegion A5/A5:             "<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
-*PageRegion B5/B5 (JIS):       "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-*PageRegion Env10/Envelope #10:        "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
-*CloseUI: *PageRegion
-
-*DefaultImageableArea: Letter
-*ImageableArea Letter/US Letter:       "18 36 594 756"
-*ImageableArea Legal/US Legal:         "18 36 594 972"
-*ImageableArea Executive/Executive:    "18 36 504 684"
-*ImageableArea A4/A4:                  "18 36 577 806"
-*ImageableArea A5/A5:                  "18 36 403 559"
-*ImageableArea B5/JIS B5:              "18 36 498 693"
-*ImageableArea EnvISOB5/B5 (ISO):      "18 36 463 673"
-*ImageableArea Env10/Com-10:           "18 36 279 648"
-*ImageableArea EnvC5/EnvC5:            "18 36 441 613"
-*ImageableArea EnvDL/EnvDL:            "18 36 294 588"
-*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504"
-
-*DefaultPaperDimension: Letter
-*PaperDimension Letter/Letter:         "612 792"
-*PaperDimension Legal/Legal:           "612 1008"
-*PaperDimension Executive/Executive:   "522 756"
-*PaperDimension A4/A4:                 "595 842"
-*PaperDimension A5/A5:                 "421 595"
-*PaperDimension B5/B5 (JIS):           "516 729"
-*PaperDimension EnvISOB5/Envelope B5:  "499 709"
-*PaperDimension Env10/Envelope #10:    "297 684"
-*PaperDimension EnvC5/Envelope C5:     "459 649"
-*PaperDimension EnvDL/Envelope DL:     "312 624"
-*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
-
-*OpenUI *InputSlot/Media Source: PickOne
-*OrderDependency: 10 AnySetup *InputSlot
-*DefaultInputSlot: Default
-*InputSlot Default/Default: ""
-*InputSlot Tray1/Tray 1: "<</ManualFeed false /MediaPosition 3>>setpagedevice"
-*InputSlot Tray2/Tray 2: "<</ManualFeed false /MediaPosition 0>>setpagedevice"
-*InputSlot Tray3/Tray 3: "<</ManualFeed false /MediaPosition 1>>setpagedevice"
-*InputSlot Manual/Manual Feed: "<</ManualFeed true /MediaPosition 3>>setpagedevice"
-*CloseUI: *InputSlot
-
-*OpenUI *Resolution/Output Resolution: PickOne
-*OrderDependency: 20 AnySetup *Resolution
-*DefaultResolution: 300dpi
-*Resolution 150dpi/150 DPI: "<</HWResolution[150 150]>>setpagedevice"
-*Resolution 300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice"
-*Resolution 600dpi/600 DPI: "<</HWResolution[600 600]>>setpagedevice"
-*Resolution 1200dpi/1200 DPI: "<</HWResolution[1200 1200]>>setpagedevice"
-*Resolution 2400dpi/2400 DPI: "<</HWResolution[2400 2400]>>setpagedevice"
-*CloseUI: *Resolution
-
-*OpenUI *Duplex/Double-Sided Printing: PickOne
-*OrderDependency: 20 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/Long Edge (Standard): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/Short Edge (Flip): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI:       *Duplex
-
-*DefaultFont: Courier
-*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
-*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
-*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
-*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
-*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
-*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
-*Font Bookman-Light: Standard "(001.004S)" Standard ROM
-*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
-*Font Courier: Standard "(002.004S)" Standard ROM
-*Font Courier-Bold: Standard "(002.004S)" Standard ROM
-*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
-*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
-*Font Helvetica: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
-*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
-*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
-*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
-*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
-*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
-*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
-*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
-*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
-*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
-*Font Symbol: Special "(001.007S)" Special ROM
-*Font Times-Bold: Standard "(001.007S)" Standard ROM
-*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
-*Font Times-Italic: Standard "(001.007S)" Standard ROM
-*Font Times-Roman: Standard "(001.007S)" Standard ROM
-*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
-*Font ZapfDingbats: Special "(001.004S)" Standard ROM
-*%
-*% End of "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $".
-*%
-*cupsFilter: "*/* 0 -"

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index a9722bb1932b2042fdcacc79efffe6dfef48c398..39bc98f23463237dd6038f376e1aebe11d38d89f 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -25,7 +25,7 @@ Info HP Color LaserJet MFP M277dw
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI socket://192.168.178.254
 State Idle
-StateTime 1554548571
+StateTime 1555348902
 ConfigTime 1496773872
 Type 8425500
 Accepting Yes
@@ -37,23 +37,3 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer TEST_linux_a5xv>
-UUID urn:uuid:c31dd0e5-43b9-3255-4673-479f088824e1
-Info TEST
-Location 
-MakeModel Remote printer: Generic postscript printer
-DeviceURI implicitclass:TEST_linux_a5xv
-State Idle
-StateTime 1555041912
-ConfigTime 1555041912
-Type 4182
-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/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-50.mount b/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-50.mount
deleted file mode 120000 (symlink)
index 52b0572..0000000
--- a/systemd/system/multi-user.target.wants/snap-canonical\x2dlivepatch-50.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-canonical\x2dlivepatch-50.mount
\ No newline at end of file

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

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

diff --git a/systemd/system/snap-canonical\x2dlivepatch-69.mount b/systemd/system/snap-canonical\x2dlivepatch-69.mount
new file mode 100644 (file)
index 0000000..8f52444
--- /dev/null
+++ b/systemd/system/snap-canonical\x2dlivepatch-69.mount
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount unit for canonical-livepatch, revision 69
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/canonical-livepatch_69.snap
+Where=/snap/canonical-livepatch/69
+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 996aea06f3eddc0ac2ac732448c3801ed705ee56..3e1eb2715c188228eddbc410192300aab58081dc 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-58.mount
+Requires=snap-canonical\x2dlivepatch-69.mount
 Wants=network.target
-After=snap-canonical\x2dlivepatch-58.mount network.target
+After=snap-canonical\x2dlivepatch-69.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/58
+WorkingDirectory=/var/snap/canonical-livepatch/69
 TimeoutStopSec=30
 Type=simple