saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index a9056c89f4cfb7885cfcae363c211d63713025a0..8b44cf754e67d07864d513665a7fcb73e26ae0ed 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1198,6 +1198,8 @@ maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd'
 maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd'
 maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O'
 maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.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'
@@ -2716,8 +2718,8 @@ maybe chmod 0755 'systemd/system/paths.target.wants'
 maybe chmod 0755 'systemd/system/printer.target.wants'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-77.mount'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-81.mount'
-maybe chmod 0644 'systemd/system/snap-core-6964.mount'
 maybe chmod 0644 'systemd/system/snap-core-7169.mount'
+maybe chmod 0644 'systemd/system/snap-core-7270.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/ppd/TEST_linux_a5xv.ppd b/cups/ppd/TEST_linux_a5xv.ppd
new file mode 100644 (file)
index 0000000..28e312e
--- /dev/null
+++ b/cups/ppd/TEST_linux_a5xv.ppd
@@ -0,0 +1,163 @@
+*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 b17d7e407b407438500439d3f34868b81a50b587..7bf000dddcd5c86c8da3a467aeaaf9239dc0682c 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -37,23 +37,3 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:e8ffbe77-33b8-36ea-453e-deb9c00c7672
-Info 
-Location 
-MakeModel Color LaserJet MFP M277dw
-DeviceURI ipp://NPI9D0E59.local:631/ipp/print
-State Idle
-StateTime 1561483391
-ConfigTime 1561483394
-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>

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

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

diff --git a/systemd/system/snap-core-6964.mount b/systemd/system/snap-core-6964.mount
deleted file mode 100644 (file)
index 0512fb2..0000000
--- a/systemd/system/snap-core-6964.mount
+++ /dev/null
@@ -1,12 +0,0 @@
-[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

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