From b923f805d22a8c48a9aaf442af8476f6f1d39dd5 Mon Sep 17 00:00:00 2001 From: gorden Date: Mon, 16 May 2022 08:29:57 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 5 +- cups/ppd/EPSON_XP_8600_Series.ppd | 218 ++++++++++++++++++ cups/printers.conf | 23 +- cups/printers.conf.O | 21 -- .../snap-rpi\\x2dimager-249.mount" | 1 - .../system/snap-rpi\\x2dimager-249.mount" | 14 -- udev/rules.d/70-snap.rpi-imager.rules | 24 -- 7 files changed, 242 insertions(+), 64 deletions(-) create mode 100644 cups/ppd/EPSON_XP_8600_Series.ppd delete mode 120000 "systemd/system/multi-user.target.wants/snap-rpi\\x2dimager-249.mount" delete mode 100644 "systemd/system/snap-rpi\\x2dimager-249.mount" delete mode 100644 udev/rules.d/70-snap.rpi-imager.rules diff --git a/.etckeeper b/.etckeeper index 3139d44a..f84585ff 100755 --- a/.etckeeper +++ b/.etckeeper @@ -16,7 +16,6 @@ mkdir -p './avahi/services' mkdir -p './binfmt.d' mkdir -p './ca-certificates/update.d' mkdir -p './cups/interfaces' -mkdir -p './cups/ppd' mkdir -p './cups/ssl' mkdir -p './dbus-1/session.d' mkdir -p './dconf/db' @@ -681,6 +680,8 @@ maybe chmod 0644 'cups/cupsd.conf' maybe chmod 0755 'cups/interfaces' maybe chgrp 'lp' 'cups/ppd' maybe chmod 0755 'cups/ppd' +maybe chgrp 'lp' 'cups/ppd/EPSON_XP_8600_Series.ppd' +maybe chmod 0640 'cups/ppd/EPSON_XP_8600_Series.ppd' maybe chgrp 'lp' 'cups/printers.conf' maybe chmod 0600 'cups/printers.conf' maybe chgrp 'lp' 'cups/printers.conf.O' @@ -1581,7 +1582,6 @@ maybe chmod 0644 'systemd/system/snap-bare-5.mount' maybe chmod 0644 'systemd/system/snap-core-12834.mount' maybe chmod 0644 'systemd/system/snap-core20-1434.mount' maybe chmod 0644 'systemd/system/snap-gtk\x2dcommon\x2dthemes-1519.mount' -maybe chmod 0644 'systemd/system/snap-rpi\x2dimager-249.mount' maybe chmod 0755 'systemd/system/sockets.target.wants' maybe chmod 0755 'systemd/system/sysinit.target.wants' maybe chmod 0755 'systemd/system/timers.target.wants' @@ -1607,7 +1607,6 @@ maybe chmod 0755 'udev' maybe chmod 0755 'udev/hwdb.d' maybe chmod 0755 'udev/rules.d' maybe chmod 0644 'udev/rules.d/70-snap.core.rules' -maybe chmod 0644 'udev/rules.d/70-snap.rpi-imager.rules' maybe chmod 0644 'udev/rules.d/vmware_hid.rules' maybe chmod 0644 'udev/udev.conf' maybe chmod 0755 'udisks2' diff --git a/cups/ppd/EPSON_XP_8600_Series.ppd b/cups/ppd/EPSON_XP_8600_Series.ppd new file mode 100644 index 00000000..d5b00d78 --- /dev/null +++ b/cups/ppd/EPSON_XP_8600_Series.ppd @@ -0,0 +1,218 @@ +*PPD-Adobe: "4.3" +*FormatVersion: "4.3" +*FileVersion: "1.28.7" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PSVersion: "(3010.000) 0" +*LanguageLevel: "3" +*FileSystem: False +*PCFileName: "drvless.ppd" +*Manufacturer: "EPSON" +*ModelName: "EPSON XP-8600 Series" +*Product: "(EPSON XP-8600 Series)" +*NickName: "EPSON XP-8600 Series, driverless, cups-filters 1.28.7" +*ShortNickName: "EPSON XP-8600 Series" +*DefaultOutputOrder: Normal +*ColorDevice: True +*cupsVersion: 2.3 +*cupsSNMPSupplies: False +*cupsLanguages: "en" +*APSupplies: "http://EPSON70D247.local.:80/PRESENTATION/BONJOUR" +*cupsStringsURI: "http://EPSON70D247.local.:80/LANGUAGES/IPP?LANG=de" +*cupsFilter2: "image/urf image/urf 0 -" +*cupsFilter2: "image/jpeg image/jpeg 0 -" +*cupsManualCopies: True +*OpenUI *PageSize/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageSize +*DefaultPageSize: A4 +*PageSize 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" +*PageSize 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" +*PageSize 120x120mm/CD/DVD: "<>setpagedevice" +*PageSize 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" +*PageSize 195x270mm/16K 195 x 270 mm: "<>setpagedevice" +*PageSize 3.5x5/3.5 x 5″: "<>setpagedevice" +*PageSize 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" +*PageSize 4x6/4 x 6″: "<>setpagedevice" +*PageSize 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" +*PageSize 5x7/5 x 7″: "<>setpagedevice" +*PageSize 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" +*PageSize 5x8/5 x 8″: "<>setpagedevice" +*PageSize 8x10/8 x 10″: "<>setpagedevice" +*PageSize 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" +*PageSize A4/A4: "<>setpagedevice" +*PageSize A4.Borderless/A4 (Borderless): "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize A6/A6: "<>setpagedevice" +*PageSize B5/JIS B5: "<>setpagedevice" +*PageSize B6/JIS B6: "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC6/CEnvelope 6: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize FanFoldGermanLegal/Foolscap: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize Letter.Borderless/US Letter (Borderless): "<>setpagedevice" +*PageSize Postcard/Hagaki: "<>setpagedevice" +*PageSize Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" +*CloseUI: *PageSize +*OpenUI *PageRegion/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageRegion +*DefaultPageRegion: A4 +*PageRegion 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" +*PageRegion 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" +*PageRegion 120x120mm/CD/DVD: "<>setpagedevice" +*PageRegion 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" +*PageRegion 195x270mm/16K 195 x 270 mm: "<>setpagedevice" +*PageRegion 3.5x5/3.5 x 5″: "<>setpagedevice" +*PageRegion 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" +*PageRegion 4x6/4 x 6″: "<>setpagedevice" +*PageRegion 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" +*PageRegion 5x7/5 x 7″: "<>setpagedevice" +*PageRegion 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" +*PageRegion 5x8/5 x 8″: "<>setpagedevice" +*PageRegion 8x10/8 x 10″: "<>setpagedevice" +*PageRegion 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion A4.Borderless/A4 (Borderless): "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion A6/A6: "<>setpagedevice" +*PageRegion B5/JIS B5: "<>setpagedevice" +*PageRegion B6/JIS B6: "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC6/CEnvelope 6: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion FanFoldGermanLegal/Foolscap: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion Letter.Borderless/US Letter (Borderless): "<>setpagedevice" +*PageRegion Postcard/Hagaki: "<>setpagedevice" +*PageRegion Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" +*CloseUI: *PageRegion +*DefaultImageableArea: A4 +*DefaultPaperDimension: A4 +*ImageableArea 101.6x180.6mm: "8.503937007874 8.503937007874 279.496062992126 503.433070866142" +*PaperDimension 101.6x180.6mm: "288 511.937007874016" +*ImageableArea 101.6x180.6mm.Borderless: "0 0 288 511.937007874016" +*PaperDimension 101.6x180.6mm.Borderless: "288 511.937007874016" +*ImageableArea 120x120mm: "8.503937007874 8.503937007874 331.653543307087 331.653543307087" +*PaperDimension 120x120mm: "340.157480314961 340.157480314961" +*ImageableArea 120x120mm.Borderless: "0 0 340.157480314961 340.157480314961" +*PaperDimension 120x120mm.Borderless: "340.157480314961 340.157480314961" +*ImageableArea 195x270mm: "8.503937007874 8.503937007874 544.251968503937 756.850393700787" +*PaperDimension 195x270mm: "552.755905511811 765.354330708661" +*ImageableArea 3.5x5: "8.503937007874 8.503937007874 243.496062992126 351.496062992126" +*PaperDimension 3.5x5: "252 360" +*ImageableArea 3.5x5.Borderless: "0 0 252 360" +*PaperDimension 3.5x5.Borderless: "252 360" +*ImageableArea 4x6: "8.503937007874 8.503937007874 279.496062992126 423.496062992126" +*PaperDimension 4x6: "288 432" +*ImageableArea 4x6.Borderless: "0 0 288 432" +*PaperDimension 4x6.Borderless: "288 432" +*ImageableArea 5x7: "8.503937007874 8.503937007874 351.496062992126 495.496062992126" +*PaperDimension 5x7: "360 504" +*ImageableArea 5x7.Borderless: "0 0 360 504" +*PaperDimension 5x7.Borderless: "360 504" +*ImageableArea 5x8: "8.503937007874 8.503937007874 351.496062992126 567.496062992126" +*PaperDimension 5x8: "360 576" +*ImageableArea 8x10: "8.503937007874 8.503937007874 567.496062992126 711.496062992126" +*PaperDimension 8x10: "576 720" +*ImageableArea 8x10.Borderless: "0 0 576 720" +*PaperDimension 8x10.Borderless: "576 720" +*ImageableArea A4: "8.503937007874 8.503937007874 586.771653543307 833.385826771654" +*PaperDimension A4: "595.275590551181 841.889763779528" +*ImageableArea A4.Borderless: "0 0 595.275590551181 841.889763779528" +*PaperDimension A4.Borderless: "595.275590551181 841.889763779528" +*ImageableArea A5: "8.503937007874 8.503937007874 411.023622047244 586.771653543307" +*PaperDimension A5: "419.527559055118 595.275590551181" +*ImageableArea A6: "8.503937007874 8.503937007874 289.133858267717 411.023622047244" +*PaperDimension A6: "297.637795275591 419.527559055118" +*ImageableArea B5: "8.503937007874 8.503937007874 507.40157480315 720" +*PaperDimension B5: "515.905511811024 728.503937007874" +*ImageableArea B6: "8.503937007874 8.503937007874 354.330708661417 507.40157480315" +*PaperDimension B6: "362.834645669291 515.905511811024" +*ImageableArea Env10: "8.503937007874 8.503937007874 288.48188976378 675.496062992126" +*PaperDimension Env10: "296.985826771654 684" +*ImageableArea EnvC6: "8.503937007874 8.503937007874 314.645669291339 450.708661417323" +*PaperDimension EnvC6: "323.149606299213 459.212598425197" +*ImageableArea EnvDL: "8.503937007874 8.503937007874 303.307086614173 615.11811023622" +*PaperDimension EnvDL: "311.811023622047 623.622047244094" +*ImageableArea FanFoldGermanLegal: "8.503937007874 8.503937007874 603.496062992126 927.496062992126" +*PaperDimension FanFoldGermanLegal: "612 936" +*ImageableArea Legal: "8.503937007874 8.503937007874 603.496062992126 999.496062992126" +*PaperDimension Legal: "612 1008" +*ImageableArea Letter: "8.503937007874 8.503937007874 603.496062992126 783.496062992126" +*PaperDimension Letter: "612 792" +*ImageableArea Letter.Borderless: "0 0 612 792" +*PaperDimension Letter.Borderless: "612 792" +*ImageableArea Postcard: "8.503937007874 8.503937007874 274.96062992126 411.023622047244" +*PaperDimension Postcard: "283.464566929134 419.527559055118" +*ImageableArea Postcard.Borderless: "0 0 283.464566929134 419.527559055118" +*PaperDimension Postcard.Borderless: "283.464566929134 419.527559055118" +*HWMargins: "8.503937007874 8.503937007874 8.503937007874 8.503937007874" +*ParamCustomPageSize Width: 1 points 153.070866141732 612 +*ParamCustomPageSize Height: 2 points 243.779527559055 3401.574803149606 +*ParamCustomPageSize WidthOffset: 3 points 0 0 +*ParamCustomPageSize HeightOffset: 4 points 0 0 +*ParamCustomPageSize Orientation: 5 int 0 3 +*CustomPageSize True: "pop pop pop <>setpagedevice" +*OpenUI *InputSlot/Media Source: PickOne +*OrderDependency: 10 AnySetup *InputSlot +*DefaultInputSlot: Main +*InputSlot Auto/Automatic: "<>setpagedevice" +*InputSlot Main/Main: "<>setpagedevice" +*InputSlot Photo/Photo: "<>setpagedevice" +*InputSlot Rear/Rear: "<>setpagedevice" +*InputSlot Disc/Disc: "<>setpagedevice" +*CloseUI: *InputSlot +*OpenUI *MediaType/Media Type: PickOne +*OrderDependency: 10 AnySetup *MediaType +*DefaultMediaType: Stationery +*MediaType Stationery/Stationery: "<>setpagedevice" +*MediaType PhotographicHighGloss/High Gloss Photo Paper: "<>setpagedevice" +*MediaType Photographic/Photo Paper: "<>setpagedevice" +*MediaType PhotographicSemiGloss/Semi-Gloss Photo Paper: "<>setpagedevice" +*MediaType PhotographicGlossy/Glossy Photo Paper: "<>setpagedevice" +*MediaType PhotographicMatte/Matte Photo Paper: "<>setpagedevice" +*MediaType StationeryCoated/Coated Paper: "<>setpagedevice" +*MediaType Labels/Labels: "<>setpagedevice" +*MediaType Envelope/Envelope: "<>setpagedevice" +*MediaType Disc/Optical Disc: "<>setpagedevice" +*CloseUI: *MediaType +*% ColorModel from urf-supported +*OpenUI *ColorModel/Print Color Mode: PickOne +*OrderDependency: 10 AnySetup *ColorModel +*ColorModel RGB/Color: "<>setpagedevice" +*ColorModel Gray/Monochrome: "<>setpagedevice" +*DefaultColorModel: RGB +*CloseUI: *ColorModel +*OpenUI *Duplex/2-Sided Printing: PickOne +*OrderDependency: 10 AnySetup *Duplex +*DefaultDuplex: None +*Duplex None/Off: "<>setpagedevice" +*Duplex DuplexNoTumble/On (Portrait): "<>setpagedevice" +*Duplex DuplexTumble/On (Landscape): "<>setpagedevice" +*CloseUI: *Duplex +*cupsBackSide: Rotated +*OpenUI *OutputBin/Output Tray: PickOne +*OrderDependency: 10 AnySetup *OutputBin +*DefaultOutputBin: FaceUp +*OutputBin FaceUp/Face Up: "" +*PageStackOrder FaceUp: Normal +*CloseUI: *OutputBin +*DefaultResolution: 360dpi +*OpenUI *cupsPrintQuality/Print Quality: PickOne +*OrderDependency: 10 AnySetup *cupsPrintQuality +*DefaultcupsPrintQuality: Normal +*cupsPrintQuality Normal/Normal: "<>setpagedevice" +*cupsPrintQuality High/High: "<>setpagedevice" +*CloseUI: *cupsPrintQuality +*OpenUI *print-scaling/Print Scaling: PickOne +*OrderDependency: 10 AnySetup *print-scaling +*Defaultprint-scaling: auto +*print-scaling auto/Automatic: "" +*print-scaling auto-fit/Auto-fit: "" +*print-scaling fill/Fill: "" +*print-scaling fit/Fit: "" +*print-scaling none/None: "" +*CloseUI: *print-scaling +*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/printers.conf b/cups/printers.conf index d05bcfe0..4d687ff4 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,4 +1,25 @@ # Printer configuration file for CUPS v2.3.3op2 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -NextPrinterId 19 +NextPrinterId 20 + +PrinterId 19 +UUID urn:uuid:5e61b87a-9208-38b0-560f-fe295ce3f09c +Info EPSON_XP_8600_Series +Location +MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 +DeviceURI implicitclass://EPSON_XP_8600_Series/ +State Idle +StateTime 1652681818 +ConfigTime 1652681818 +Type 36892 +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/cups/printers.conf.O b/cups/printers.conf.O index d99c2d27..d05bcfe0 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -2,24 +2,3 @@ # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING NextPrinterId 19 - -PrinterId 18 -UUID urn:uuid:f420b71c-4dca-3185-622f-49181b364797 -Info EPSON_XP_8600_Series -Location -MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 -DeviceURI implicitclass://EPSON_XP_8600_Series/ -State Idle -StateTime 1652652008 -ConfigTime 1652652008 -Type 36892 -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/systemd/system/multi-user.target.wants/snap-rpi\\x2dimager-249.mount" "b/systemd/system/multi-user.target.wants/snap-rpi\\x2dimager-249.mount" deleted file mode 120000 index 57bee8a1..00000000 --- "a/systemd/system/multi-user.target.wants/snap-rpi\\x2dimager-249.mount" +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-rpi\x2dimager-249.mount \ No newline at end of file diff --git "a/systemd/system/snap-rpi\\x2dimager-249.mount" "b/systemd/system/snap-rpi\\x2dimager-249.mount" deleted file mode 100644 index 4f1d0a97..00000000 --- "a/systemd/system/snap-rpi\\x2dimager-249.mount" +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Mount unit for rpi-imager, revision 249 -Before=snapd.service -After=zfs-mount.service - -[Mount] -What=/var/lib/snapd/snaps/rpi-imager_249.snap -Where=/snap/rpi-imager/249 -Type=squashfs -Options=nodev,ro,x-gdu.hide,x-gvfs-hide -LazyUnmount=yes - -[Install] -WantedBy=multi-user.target diff --git a/udev/rules.d/70-snap.rpi-imager.rules b/udev/rules.d/70-snap.rpi-imager.rules deleted file mode 100644 index 0aecd6e0..00000000 --- a/udev/rules.d/70-snap.rpi-imager.rules +++ /dev/null @@ -1,24 +0,0 @@ -# This file is automatically generated. -# opengl -KERNEL=="dma_buf_te", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="mali[0-9]*", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="nvhost-*", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="nvmap", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="pvr_sync", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="renderD[0-9]*", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="tegra_dc_[0-9]*", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="tegra_dc_ctrl", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="vchiq", TAG+="snap_rpi-imager_rpi-imager" -# opengl -KERNEL=="vcsm-cma", TAG+="snap_rpi-imager_rpi-imager" -# opengl -SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="snap_rpi-imager_rpi-imager" -TAG=="snap_rpi-imager_rpi-imager", RUN+="/usr/lib/snapd/snap-device-helper $env{ACTION} snap_rpi-imager_rpi-imager $devpath $major:$minor"