daily autocommit

diff --git a/.etckeeper b/.etckeeper
index a91b1af8ae839e8b6aa2db910ee0b162bd1adb2c..0f8c631144cc37f18f1dacc559dd7d181cc2b17a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1498,8 +1498,6 @@ 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/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
-maybe chgrp 'lp' 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
-maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
 maybe chgrp 'lp' 'cups/printers.conf.O'
 maybe chmod 0600 'cups/printers.conf.O'
 maybe chmod 0644 'cups/raw.convs'

diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
deleted file mode 100644 (file)
index bfe3ed1..0000000
--- a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
+++ /dev/null
@@ -1,100 +0,0 @@
-*PPD-Adobe: "4.3"
-*FormatVersion: "4.3"
-*FileVersion: "1.27.4"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PSVersion: "(3010.000) 0"
-*LanguageLevel: "3"
-*FileSystem: False
-*PCFileName: "drvless.ppd"
-*Manufacturer: "hp"
-*ModelName: "hp LaserJet 9040"
-*Product: "(hp LaserJet 9040)"
-*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4"
-*ShortNickName: "hp LaserJet 9040"
-*DefaultOutputOrder: Normal
-*ColorDevice: True
-*cupsVersion: 2.3
-*cupsSNMPSupplies: False
-*cupsLanguages: "en"
-*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
-*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
-*% Printer did not supply page size info via IPP, using defaults
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: Letter
-*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*DefaultImageableArea: Letter
-*ImageableArea Letter/US Letter: "18 12 594 780"
-*ImageableArea Legal/US Legal: "18 12 594 996"
-*ImageableArea Executive/Executive: "18 12 504 744"
-*ImageableArea Tabloid/Tabloid: "18 12 774 1212"
-*ImageableArea A3/A3: "18 12 824 1179"
-*ImageableArea A4/A4: "18 12 577 830"
-*ImageableArea A5/A5: "18 12 402 583"
-*ImageableArea B5/JIS B5: "18 12 498 717"
-*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697"
-*ImageableArea Env10/Envelope #10 : "18 12 279 672"
-*ImageableArea EnvC5/Envelope C5: "18 12 441 637"
-*ImageableArea EnvDL/Envelope DL: "18 12 294 612"
-*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528"
-*DefaultPaperDimension: Letter
-*PaperDimension Letter/US Letter: "612 792"
-*PaperDimension Legal/US Legal: "612 1008"
-*PaperDimension Executive/Executive: "522 756"
-*PaperDimension Tabloid/Tabloid: "792 1224"
-*PaperDimension A3/A3: "842 1191"
-*PaperDimension A4/A4: "595 842"
-*PaperDimension A5/A5: "420 595"
-*PaperDimension B5/JIS B5: "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 *ColorModel/Print Color Mode: PickOne
-*OrderDependency: 10 AnySetup *ColorModel
-*DefaultColorModel: Gray
-*ColorModel FastGray/Fast Grayscale: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI: *Duplex
-*DefaultResolution: 300dpi
-*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 6f87d501f4f4d499ba7f40ce44c318c711362724..26dfc113f00570ef816adba8a2f2645e536ef04e 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 123
+NextPrinterId 125
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -85,7 +85,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 1599022570
+StateTime 1599195099
 ConfigTime 1590465380
 Type 8425500
 Accepting Yes
@@ -97,48 +97,6 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer hp8>
-PrinterId 122
-UUID urn:uuid:3090b607-2d08-37c3-56ab-9d3854ff4ac2
-Info 
-Location 
-MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp8/
-State Idle
-StateTime 1599029349
-ConfigTime 1599029349
-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_9040_8BFB3E_>
-PrinterId 121
-UUID urn:uuid:b0034a43-4f17-3aa0-4be1-440a84f2dea2
-Info 
-Location 
-MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
-State Idle
-StateTime 1599029347
-ConfigTime 1599029347
-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/libvirt/qemu/win10.xml b/libvirt/qemu/win10.xml
index 0cbb5c583aabba6079bc6e8f006ac401dc440e93..f4d1097ade319d81f9fcafcbf66e2475bb9c4035 100644 (file)
--- a/libvirt/qemu/win10.xml
+++ b/libvirt/qemu/win10.xml
@@ -56,7 +56,6 @@ or other application using the libvirt API.
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='/var/lib/libvirt/images/virtio-win-0.1.173.iso'/>
       <target dev='sdb' bus='sata'/>
       <readonly/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>