saving uncommitted changes in /etc prior to apt run

diff --git a/cups/printers.conf b/cups/printers.conf
index dcaf71b8e284898129bac7b01b95f4a8bb71bbd8..b3cecc8a0c54606bd74ebfe0cd8b834ed4327147 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -8,7 +8,7 @@ Location bruni
 MakeModel Kyocera Mita FS-1020D
 DeviceURI usb://Kyocera/FS-1020D?serial=XAX5991704
 State Idle
-StateTime 1560091258
+StateTime 1564501421
 ConfigTime 1531335449
 Type 8392788
 Accepting Yes
@@ -28,7 +28,7 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1564407044
+StateTime 1564475687
 ConfigTime 1531164608
 Reason wifi-not-configured-report
 Type 8425564
@@ -46,19 +46,17 @@ Attribute marker-low-levels 5,5,5,4
 Attribute marker-high-levels 100,100,100,100
 Attribute marker-names Cyan Cartridge HP CF401A,Magenta Cartridge HP CF403A,Yellow Cartridge HP CF402A,Black Cartridge HP CF400A
 Attribute marker-types toner,toner,toner,toner
-Attribute marker-change-time 1564407026
+Attribute marker-change-time 1564475669
 </Printer>
 <Printer HP_Color_LaserJet_MFP_M277dw_28CAA8_>
-UUID urn:uuid:a1f3a96e-13a9-38bd-5ecd-c0004aa407d2
-AuthInfoRequired none
+UUID urn:uuid:17681eb7-574d-34e2-438f-95010b8e10f9
 Info 
 Location 
 MakeModel Color LaserJet MFP M277dw
 DeviceURI ipp://NPI28CAA8.local:631/ipp/print
 State Idle
-StateTime 1564407126
-ConfigTime 1564407026
-Reason wifi-not-configured-report
+StateTime 1564501857
+ConfigTime 1564501859
 Type 4188
 Accepting Yes
 Shared No
@@ -69,11 +67,4 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 Option cups-browsed true
-Attribute marker-colors \#00FFFF,#FF00FF,#FFFF00,#000000
-Attribute marker-levels 80,85,82,85
-Attribute marker-low-levels 5,5,5,4
-Attribute marker-high-levels 100,100,100,100
-Attribute marker-names Cyan Cartridge HP CF401A,Magenta Cartridge HP CF403A,Yellow Cartridge HP CF402A,Black Cartridge HP CF400A
-Attribute marker-types toner,toner,toner,toner
-Attribute marker-change-time 1564407083
 </Printer>

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 06697d985257bbf5f4a578a4238adadf3f43146d..2debdc58939f240ea0ddfdcfae11eae0819b8aaa 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -28,7 +28,7 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1564407044
+StateTime 1564475687
 ConfigTime 1531164608
 Reason wifi-not-configured-report
 Type 8425564
@@ -46,34 +46,5 @@ Attribute marker-low-levels 5,5,5,4
 Attribute marker-high-levels 100,100,100,100
 Attribute marker-names Cyan Cartridge HP CF401A,Magenta Cartridge HP CF403A,Yellow Cartridge HP CF402A,Black Cartridge HP CF400A
 Attribute marker-types toner,toner,toner,toner
-Attribute marker-change-time 1564407026
-</Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_28CAA8_>
-UUID urn:uuid:a1f3a96e-13a9-38bd-5ecd-c0004aa407d2
-Info 
-Location 
-MakeModel Color LaserJet MFP M277dw
-DeviceURI ipp://NPI28CAA8.local:631/ipp/print
-State Idle
-StateTime 1564407082
-ConfigTime 1564407026
-Reason wifi-not-configured-report
-Reason cups-waiting-for-job-completed
-Type 4188
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-Attribute marker-colors \#00FFFF,#FF00FF,#FFFF00,#000000
-Attribute marker-levels 80,85,82,85
-Attribute marker-low-levels 5,5,5,4
-Attribute marker-high-levels 100,100,100,100
-Attribute marker-names Cyan Cartridge HP CF401A,Magenta Cartridge HP CF403A,Yellow Cartridge HP CF402A,Black Cartridge HP CF400A
-Attribute marker-types toner,toner,toner,toner
-Attribute marker-change-time 1564407083
+Attribute marker-change-time 1564475669
 </Printer>

diff --git a/ssh/ssh_config b/ssh/ssh_config
index 2da412561480152226502e97da01979a3a3af841..9cd2244cb9d32d44af2b48d832a5495de4860c50 100644 (file)
--- a/ssh/ssh_config
+++ b/ssh/ssh_config
@@ -47,6 +47,7 @@ Host *
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
     SendEnv LANG LC_*
-    HashKnownHosts yes
+    HashKnownHosts no
     GSSAPIAuthentication yes
     ForwardAgent yes
+    ServerAliveInterval 10

diff --git a/ssh/sshd_config b/ssh/sshd_config
index 58af0c7de93ad2e705583a11cb92153151d1e5a8..639cd3a391198de844bf5fa8a6803a4cbc4ff191 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -110,6 +110,7 @@ PrintLastLog yes
 
 # Allow client to pass locale environment variables
 AcceptEnv LANG LC_*
+AcceptEnv XMODIFIERS
 
 # override default of no subsystems
 Subsystem      sftp    /usr/lib/openssh/sftp-server