From 55074f908e7972de00f72e47c598c396aea0b57c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Thu, 17 Sep 2020 09:58:54 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 6 +- cups/ppd/hp8.ppd | 100 ------------------ cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd | 100 ------------------ cups/printers.conf.O | 10 +- hosts | 57 ++++++++-- .../snap-core-9665.mount | 1 - .../snap-core-9993.mount | 1 + ...p-core-9665.mount => snap-core-9993.mount} | 6 +- 8 files changed, 56 insertions(+), 225 deletions(-) delete mode 100644 cups/ppd/hp8.ppd delete mode 100644 cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd delete mode 120000 systemd/system/multi-user.target.wants/snap-core-9665.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-9993.mount rename systemd/system/{snap-core-9665.mount => snap-core-9993.mount} (54%) diff --git a/.etckeeper b/.etckeeper index 548c4fd..c2bf3c6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1498,10 +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/hp8.ppd' -maybe chmod 0640 'cups/ppd/hp8.ppd' -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' @@ -3305,8 +3301,8 @@ maybe chmod 0644 'systemd/system/snap-atom-259.mount' maybe chmod 0644 'systemd/system/snap-atom-260.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-94.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-95.mount' -maybe chmod 0644 'systemd/system/snap-core-9665.mount' maybe chmod 0644 'systemd/system/snap-core-9804.mount' +maybe chmod 0644 'systemd/system/snap-core-9993.mount' maybe chmod 0644 'systemd/system/snap-core18-1880.mount' maybe chmod 0644 'systemd/system/snap-core18-1885.mount' maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d28\x2d1804-128.mount' diff --git a/cups/ppd/hp8.ppd b/cups/ppd/hp8.ppd deleted file mode 100644 index bfe3ed1..0000000 --- a/cups/ppd/hp8.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: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize Tabloid/Tabloid: "<>setpagedevice" -*PageSize A3/A3: "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/JIS B5: "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize Env10/Envelope #10 : "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Letter -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion Tabloid/Tabloid: "<>setpagedevice" -*PageRegion A3/A3: "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/JIS B5: "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion Env10/Envelope #10 : "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>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: "<>setpagedevice" -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" -*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 -*DefaultResolution: 300dpi -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd deleted file mode 100644 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: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize Tabloid/Tabloid: "<>setpagedevice" -*PageSize A3/A3: "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/JIS B5: "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize Env10/Envelope #10 : "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Letter -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion Tabloid/Tabloid: "<>setpagedevice" -*PageRegion A3/A3: "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/JIS B5: "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion Env10/Envelope #10 : "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>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: "<>setpagedevice" -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" -*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 -*DefaultResolution: 300dpi -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 5a8e164..e31eefc 100644 --- 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 138 +NextPrinterId 142 PrinterId 1 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061 @@ -98,15 +98,15 @@ OpPolicy default ErrorPolicy retry-job -PrinterId 137 -UUID urn:uuid:240cde13-32a9-3c4c-4638-52383d1a2f5a +PrinterId 140 +UUID urn:uuid:e077201b-3c37-34d8-4bf2-a93ee7510ec9 Info Location MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4 DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/ State Idle -StateTime 1600152667 -ConfigTime 1600152667 +StateTime 1600239489 +ConfigTime 1600239489 Type 8400988 Accepting Yes Shared No diff --git a/hosts b/hosts index a6db182..d053bb6 100644 --- a/hosts +++ b/hosts @@ -8,34 +8,55 @@ ff00::0 ip6-mcastprefix ff02::1 ip6-allnodes ff02::2 ip6-allrouters - - +#-- start managed zone -- 10.100.59.29 gwh-caps.gwh.local gwh-caps 10.100.67.28 thn-caps.then.org thn-caps 10.100.67.29 swl-caps.then.org swl-caps 10.100.69.25 the-archiv.thev.local the-archiv +10.100.69.28 tvtsmod01.thuega-energie.de tvtsmod01 +10.100.69.28 the-work.thuega-energie.de the-work +10.100.69.28 tvtsmod01.thev.local tvtsmod01 10.100.69.28 the-work.thev.local the-work 10.100.69.29 the-caps.thev.local the-caps 10.101.204.10 heg-caps.cpheg.local heg-caps +10.101.204.10 heg-caps.heg.de heg-caps 10.101.204.11 heg-work.cpheg.local heg-work +10.101.204.11 sedna.cpheg.local sedna +10.101.204.11 heg-work.heg.de heg-work +10.101.204.11 sedna.heg.de sedna 10.101.240.55 sbh-caps.harzburg.local sbh-caps +10.101.240.57 archiv-server.harzburg.local archiv-server 10.101.240.57 sbh-archiv.harzburg.local sbh-archiv 10.102.150.10 ems-caps.e-ms.de ems-caps -10.102.150.30 ems-work.e-ms.de ems-work 10.102.150.20 ems-archiv.e-ms.de ems-archiv +10.102.150.30 ems-work.e-ms.de ems-work 10.103.0.25 swh-caps.swhke.local swh-caps 10.107.1.56 gew-caps.gew.whv gew-caps 10.107.1.57 gew-modarchiv.gew.whv gew-modarchiv 10.107.1.58 gew-work.gew.whv gew-work 10.110.1.201 erw-cs.ewerk.local erw-cs -10.110.1.69 erw-caps.ewerk.local erw-caps +10.110.1.201 erwcs.ewerk.local erwcs +10.110.1.201 erw-cs.rz.wan erw-cs +10.110.1.201 erwcs.rz.wan erwcs 10.111.10.14 lkw-caps.lkwlan.intra lkw-caps -10.111.10.16 lkw-cs.lkwlan.intra lkw-cs -10.111.10.216 evk-cs.lkwlan.intra evk-cs -10.111.10.218 gsw-cs.lkwlan.intra gsw-cs +10.111.10.16 lkw-cs.rz.wan lkw-cs +10.111.10.16 lkwcs.rz.wan lkwcs +10.111.10.216 evk-cs.rz.wan evk-cs +10.111.10.216 evkcs.rz.wan evkcs +10.111.10.218 gsw-cs.rz.wan gsw-cs +10.111.10.218 gswcs.rz.wan gswcs +10.111.10.9 vis-archiv.visconto.intern vis-archiv +10.111.10.9 vis-archiv.stwan.intern vis-archiv 10.111.10.9 vis-archiv.lkwlan.intra vis-archiv +10.111.10.9 vis-archiv.ewerk.local vis-archiv +10.111.10.9 vis-archiv.swk.intern vis-archiv +10.111.10.9 vis-archiv.stw.local vis-archiv +10.111.10.9 vis-archiv.swl.local vis-archiv +10.111.10.9 vis-archiv.evk.intra vis-archiv +10.112.3.11 eins-work.make-it.local eins-work 10.112.3.11 eins-work.1net.dom eins-work 10.113.1.60 evk-caps.evk.intra evk-caps +10.114.13.60 egs-archiv.erdgas-schwaben.intern egs-archiv 10.114.13.60 egs-archiv.erdgas-schwaben.local egs-archiv 10.114.13.63 egs-caps.erdgas-schwaben.local egs-caps 10.114.13.66 egs-work.erdgas-schwaben.local egs-work @@ -43,22 +64,36 @@ ff02::2 ip6-allrouters 10.115.0.23 esm-archiv.esmselb.de esm-archiv 10.115.0.26 esm-work.esmselb.de esm-work 10.118.0.35 guf-work.gasuf.intra guf-work +10.118.0.38 gasuf-archiv.gasuf.intra gasuf-archiv 10.118.0.38 guf-archiv.gasuf.intra guf-archiv 10.118.0.39 guf-caps.gasuf.intra guf-caps -10.120.151.54 sbl-cs.stwan.intern sbl-cs +10.120.151.54 sbl-cs.stwan.local sbl-cs +10.120.151.54 sbl-cs.swl.local sbl-cs 10.120.250.51 vis-work.visconto.intern vis-work +10.120.250.51 vis-work.lkwlan.intra vis-work +10.120.250.51 vis-work.stwan.intern vis-work +10.120.250.51 vis-work.ewerk.local vis-work +10.120.250.51 vis-work.swk.intern vis-work +10.120.250.51 vis-work.stw.local vis-work +10.120.250.51 vis-work.evk.intra vis-work +10.120.250.51 vis-work.swl.local vis-work 10.120.250.52 vis-caps.stwan.intern vis-caps 10.125.112.109 smh-caps.stwmhl.local smh-caps 10.125.128.245 eto-caps.stwk.local eto-caps 10.125.64.216 sbl-caps.swl.local sbl-caps -10.125.80.11 arn-caps.vums.local arn-caps 10.128.1.14 grz-caps.evgreiz.local grz-caps 10.128.1.60 grz-archiv.evgreiz.local grz-archiv -10.130.4.200 ems-hrarchiv.modarch.lan ems-hrarchiv -10.130.4.201 ems-cs.e-ms.local ems-cs +10.130.4.200 ems-hrarchiv.e-ms.de ems-hrarchiv +10.130.4.201 ems-cs.e-ms.de ems-cs 10.143.252.3 swg-caps.stadtwerke.intra swg-caps 10.146.224.26 sho-caps.sapswh.stadtwerke-homburg.de sho-caps +10.146.224.30 sho-modwork.sapswh.stadtwerke-homburg.de sho-modwork 10.146.224.30 sho-work.sapswh.stadtwerke-homburg.de sho-work +10.146.224.36 sho-modarch.sapswh.stadtwerke-homburg.de sho-modarch 10.146.224.36 sho-archiv.sapswh.stadtwerke-homburg.de sho-archiv 10.189.217.11 glo-work.stadtwerke-gt.de glo-work 192.168.10.8 stc-archiv.stc.local stc-archiv + +10.110.1.69 erw-caps.ewerk.local erw-caps +10.125.80.11 arn-caps.vums.local arn-caps +#-- end managed zone -- diff --git a/systemd/system/multi-user.target.wants/snap-core-9665.mount b/systemd/system/multi-user.target.wants/snap-core-9665.mount deleted file mode 120000 index ee2f651..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-9665.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-9665.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-9993.mount b/systemd/system/multi-user.target.wants/snap-core-9993.mount new file mode 120000 index 0000000..96fc458 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-9993.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-9993.mount \ No newline at end of file diff --git a/systemd/system/snap-core-9665.mount b/systemd/system/snap-core-9993.mount similarity index 54% rename from systemd/system/snap-core-9665.mount rename to systemd/system/snap-core-9993.mount index f7c3387..4990380 100644 --- a/systemd/system/snap-core-9665.mount +++ b/systemd/system/snap-core-9993.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for core, revision 9665 +Description=Mount unit for core, revision 9993 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/core_9665.snap -Where=/snap/core/9665 +What=/var/lib/snapd/snaps/core_9993.snap +Where=/snap/core/9993 Type=squashfs Options=nodev,ro,x-gdu.hide LazyUnmount=yes -- 2.43.0