From f77048d7b160c231e94c8b563b175e343e9c18c6 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sat, 11 Dec 2021 01:21:45 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .../HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd | 46 +++++++++---------- ...HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O | 46 +++++++++---------- cups/printers.conf | 29 +++--------- cups/printers.conf.O | 38 --------------- initramfs-tools/initramfs.conf | 2 +- network/interfaces | 12 +++++ systemd/network/wired.network | 2 +- 7 files changed, 66 insertions(+), 109 deletions(-) diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd index 9b31d188..ea78f210 100644 --- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd @@ -126,63 +126,63 @@ *DefaultInputSlot: Auto *InputSlot Auto/Automatic: "<>setpagedevice" *InputSlot Manual/Manual: "<>setpagedevice" -*InputSlot Tray1/Tray 1: "<>setpagedevice" -*InputSlot Tray2/Tray 2: "<>setpagedevice" +*InputSlot Tray1/Fach 1: "<>setpagedevice" +*InputSlot Tray2/Fach 2: "<>setpagedevice" *CloseUI: *InputSlot *OpenUI *MediaType: PickOne *OrderDependency: 10 AnySetup *MediaType *DefaultMediaType: HPMatte90gsm -*MediaType Stationery/Plain Paper: "<>setpagedevice" +*MediaType Stationery/Standardpapier: "<>setpagedevice" *MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" *MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" *MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" *MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" *MediaType HPCover/HPCover: "<>setpagedevice" *MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" -*MediaType PhotographicGlossy/Glossy Photo Paper: "<>setpagedevice" +*MediaType PhotographicGlossy/Fotoglanzpapier: "<>setpagedevice" *MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" *MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" *MediaType StationeryLightweight/Lightweight Paper: "<>setpagedevice" *MediaType ExtraLight/extraLight: "<>setpagedevice" *MediaType Intermediate/intermediate: "<>setpagedevice" *MediaType Midweight/midweight: "<>setpagedevice" -*MediaType StationeryHeavyweight/Heavyweight Paper: "<>setpagedevice" +*MediaType StationeryHeavyweight/Schweres Papier: "<>setpagedevice" *MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" -*MediaType PhotographicHighGloss/High Gloss Photo Paper: "<>setpagedevice" +*MediaType PhotographicHighGloss/Hochglanzfotopapier: "<>setpagedevice" *MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" *MediaType CardGlossy/cardGlossy: "<>setpagedevice" -*MediaType Transparency/Transparency: "<>setpagedevice" -*MediaType Labels/Labels: "<>setpagedevice" -*MediaType StationeryLetterhead/Letterhead: "<>setpagedevice" -*MediaType Envelope/Envelope: "<>setpagedevice" -*MediaType EnvelopeHeavyweight/Heavyweight Envelope: "<>setpagedevice" -*MediaType StationeryPreprinted/Preprinted Paper: "<>setpagedevice" -*MediaType StationeryPrepunched/Punched Paper: "<>setpagedevice" +*MediaType Transparency/Transparenz: "<>setpagedevice" +*MediaType Labels/Etiketten: "<>setpagedevice" +*MediaType StationeryLetterhead/Briefkopf: "<>setpagedevice" +*MediaType Envelope/Umschlag: "<>setpagedevice" +*MediaType EnvelopeHeavyweight/Schwerer Umschlag: "<>setpagedevice" +*MediaType StationeryPreprinted/Vorbedrucktes Papier: "<>setpagedevice" +*MediaType StationeryPrepunched/Gelochtes Papier: "<>setpagedevice" *MediaType StationeryColored/stationery-colored: "<>setpagedevice" *MediaType StationeryBond/stationery-bond: "<>setpagedevice" *MediaType Recycled/recycled: "<>setpagedevice" *MediaType Rough/rough: "<>setpagedevice" *MediaType HeavyRough/heavyRough: "<>setpagedevice" -*MediaType PhotographicFilm/Photo Film: "<>setpagedevice" +*MediaType PhotographicFilm/Fotofilm: "<>setpagedevice" *CloseUI: *MediaType -*OpenUI *ColorModel/Color Mode: PickOne +*OpenUI *ColorModel/Farbmodus: PickOne *OrderDependency: 10 AnySetup *ColorModel -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" +*ColorModel Gray/Graustufen: "<>setpagedevice" +*ColorModel RGB/Farbe: "<>setpagedevice" *DefaultColorModel: RGB *CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne +*OpenUI *Duplex/Doppelseitig drucken: PickOne *OrderDependency: 10 AnySetup *Duplex *DefaultDuplex: None -*Duplex None/Off (1-Sided): "<>setpagedevice" -*Duplex DuplexNoTumble/Long-Edge (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/Short-Edge (Landscape): "<>setpagedevice" +*Duplex None/Aus (Einseitig): "<>setpagedevice" +*Duplex DuplexNoTumble/Lange Kante (Hochformat): "<>setpagedevice" +*Duplex DuplexTumble/Kurze Kante (Querformat): "<>setpagedevice" *CloseUI: *Duplex *cupsBackSide: Normal *DefaultResolution: 600dpi -*OpenUI *cupsPrintQuality/Print Quality: PickOne +*OpenUI *cupsPrintQuality/Druckqualität: PickOne *OrderDependency: 10 AnySetup *cupsPrintQuality *DefaultcupsPrintQuality: Normal -*cupsPrintQuality Draft/Draft: "<>setpagedevice" +*cupsPrintQuality Draft/Entwurf: "<>setpagedevice" *cupsPrintQuality Normal/Normal: "<>setpagedevice" *CloseUI: *cupsPrintQuality diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O index 9b31d188..ea78f210 100644 --- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O @@ -126,63 +126,63 @@ *DefaultInputSlot: Auto *InputSlot Auto/Automatic: "<>setpagedevice" *InputSlot Manual/Manual: "<>setpagedevice" -*InputSlot Tray1/Tray 1: "<>setpagedevice" -*InputSlot Tray2/Tray 2: "<>setpagedevice" +*InputSlot Tray1/Fach 1: "<>setpagedevice" +*InputSlot Tray2/Fach 2: "<>setpagedevice" *CloseUI: *InputSlot *OpenUI *MediaType: PickOne *OrderDependency: 10 AnySetup *MediaType *DefaultMediaType: HPMatte90gsm -*MediaType Stationery/Plain Paper: "<>setpagedevice" +*MediaType Stationery/Standardpapier: "<>setpagedevice" *MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" *MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" *MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" *MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" *MediaType HPCover/HPCover: "<>setpagedevice" *MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" -*MediaType PhotographicGlossy/Glossy Photo Paper: "<>setpagedevice" +*MediaType PhotographicGlossy/Fotoglanzpapier: "<>setpagedevice" *MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" *MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" *MediaType StationeryLightweight/Lightweight Paper: "<>setpagedevice" *MediaType ExtraLight/extraLight: "<>setpagedevice" *MediaType Intermediate/intermediate: "<>setpagedevice" *MediaType Midweight/midweight: "<>setpagedevice" -*MediaType StationeryHeavyweight/Heavyweight Paper: "<>setpagedevice" +*MediaType StationeryHeavyweight/Schweres Papier: "<>setpagedevice" *MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" -*MediaType PhotographicHighGloss/High Gloss Photo Paper: "<>setpagedevice" +*MediaType PhotographicHighGloss/Hochglanzfotopapier: "<>setpagedevice" *MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" *MediaType CardGlossy/cardGlossy: "<>setpagedevice" -*MediaType Transparency/Transparency: "<>setpagedevice" -*MediaType Labels/Labels: "<>setpagedevice" -*MediaType StationeryLetterhead/Letterhead: "<>setpagedevice" -*MediaType Envelope/Envelope: "<>setpagedevice" -*MediaType EnvelopeHeavyweight/Heavyweight Envelope: "<>setpagedevice" -*MediaType StationeryPreprinted/Preprinted Paper: "<>setpagedevice" -*MediaType StationeryPrepunched/Punched Paper: "<>setpagedevice" +*MediaType Transparency/Transparenz: "<>setpagedevice" +*MediaType Labels/Etiketten: "<>setpagedevice" +*MediaType StationeryLetterhead/Briefkopf: "<>setpagedevice" +*MediaType Envelope/Umschlag: "<>setpagedevice" +*MediaType EnvelopeHeavyweight/Schwerer Umschlag: "<>setpagedevice" +*MediaType StationeryPreprinted/Vorbedrucktes Papier: "<>setpagedevice" +*MediaType StationeryPrepunched/Gelochtes Papier: "<>setpagedevice" *MediaType StationeryColored/stationery-colored: "<>setpagedevice" *MediaType StationeryBond/stationery-bond: "<>setpagedevice" *MediaType Recycled/recycled: "<>setpagedevice" *MediaType Rough/rough: "<>setpagedevice" *MediaType HeavyRough/heavyRough: "<>setpagedevice" -*MediaType PhotographicFilm/Photo Film: "<>setpagedevice" +*MediaType PhotographicFilm/Fotofilm: "<>setpagedevice" *CloseUI: *MediaType -*OpenUI *ColorModel/Color Mode: PickOne +*OpenUI *ColorModel/Farbmodus: PickOne *OrderDependency: 10 AnySetup *ColorModel -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" +*ColorModel Gray/Graustufen: "<>setpagedevice" +*ColorModel RGB/Farbe: "<>setpagedevice" *DefaultColorModel: RGB *CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne +*OpenUI *Duplex/Doppelseitig drucken: PickOne *OrderDependency: 10 AnySetup *Duplex *DefaultDuplex: None -*Duplex None/Off (1-Sided): "<>setpagedevice" -*Duplex DuplexNoTumble/Long-Edge (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/Short-Edge (Landscape): "<>setpagedevice" +*Duplex None/Aus (Einseitig): "<>setpagedevice" +*Duplex DuplexNoTumble/Lange Kante (Hochformat): "<>setpagedevice" +*Duplex DuplexTumble/Kurze Kante (Querformat): "<>setpagedevice" *CloseUI: *Duplex *cupsBackSide: Normal *DefaultResolution: 600dpi -*OpenUI *cupsPrintQuality/Print Quality: PickOne +*OpenUI *cupsPrintQuality/Druckqualität: PickOne *OrderDependency: 10 AnySetup *cupsPrintQuality *DefaultcupsPrintQuality: Normal -*cupsPrintQuality Draft/Draft: "<>setpagedevice" +*cupsPrintQuality Draft/Entwurf: "<>setpagedevice" *cupsPrintQuality Normal/Normal: "<>setpagedevice" *CloseUI: *cupsPrintQuality diff --git a/cups/printers.conf b/cups/printers.conf index bd74b31e..0223b796 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -2,33 +2,15 @@ # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -UUID urn:uuid:3b4a7e30-0947-3781-6b17-734b574d72e5 -Info HP_Color_LaserJet_MFP_M277dw_9D0E59_ -MakeModel Color LaserJet MFP M277dw -DeviceURI ipp://NPI9D0E59.local:631/ipp/print -State Idle -StateTime 1543532968 -ConfigTime 1543608417 -Type 4188 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job - - -UUID urn:uuid:58cccd8a-c5af-3485-53ad-fadcd8cae821 +UUID urn:uuid:f71eb3a2-2719-396c-5db1-c4fbee111c70 Info Location -MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2 +MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1545692822 -ConfigTime 1545794570 -Type 8425564 +StateTime 1639181987 +ConfigTime 1639181991 +Type 4188 Accepting Yes Shared No JobSheets none none @@ -37,4 +19,5 @@ 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 290d7a5d..ce86cb78 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,41 +1,3 @@ # Printer configuration file for CUPS v2.2.7 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING - -UUID urn:uuid:3b4a7e30-0947-3781-6b17-734b574d72e5 -Info HP_Color_LaserJet_MFP_M277dw_9D0E59_ -MakeModel Color LaserJet MFP M277dw -DeviceURI ipp://NPI9D0E59.local:631/ipp/print -State Idle -StateTime 1543532968 -ConfigTime 1543608417 -Type 4188 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job - - -UUID urn:uuid:58cccd8a-c5af-3485-53ad-fadcd8cae821 -Info -Location -MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2 -DeviceURI ipps://NPI9D0E59.local:443/ipp/print -State Idle -StateTime 1545692822 -ConfigTime 1545692822 -Type 8425564 -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/initramfs-tools/initramfs.conf b/initramfs-tools/initramfs.conf index 2bb7ab11..c3e79f63 100644 --- a/initramfs-tools/initramfs.conf +++ b/initramfs-tools/initramfs.conf @@ -71,4 +71,4 @@ DEVICE= NFSROOT=auto -IP=192.168.178.88::192.168.178.1:255.255.255.0:homeserver +IP=192.168.178.25::192.168.178.1:255.255.255.0:homeserver diff --git a/network/interfaces b/network/interfaces index f1bd92ed..0eaaf3fd 100644 --- a/network/interfaces +++ b/network/interfaces @@ -1,2 +1,14 @@ auto lo iface lo inet loopback + + +auto lo +iface lo inet loopback + +auto enp2s0 +iface enp2s0 inet static + address 192.168.178.25 + netmask 255.255.255.0 + gateway 192.168.178.1 + dns-nameservers 192.168.178.1 8.8.8.8 + dns-search home.lan diff --git a/systemd/network/wired.network b/systemd/network/wired.network index cef57fd3..fbb27317 100644 --- a/systemd/network/wired.network +++ b/systemd/network/wired.network @@ -1,5 +1,5 @@ [Match] -Name=eth0 +Name=enp2s0 [Network] DNS=192.168.178.1 -- 2.43.0