saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index b17c1447c9afb7ab870fc5c09dc5225e5aceec95..841dc443d401afb62c343813331e8a472e7eac59 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -147,6 +147,7 @@ maybe chmod 0600 'NetworkManager/system-connections/Sommerresidenz'
 maybe chmod 0600 'NetworkManager/system-connections/TBZ-PARIV'
 maybe chmod 0600 'NetworkManager/system-connections/TP-LINK_Extender_C41F08'
 maybe chmod 0600 'NetworkManager/system-connections/WLAN-33FRA2'
+maybe chmod 0600 'NetworkManager/system-connections/Zum Riedensee'
 maybe chmod 0600 'NetworkManager/system-connections/guenet_kit'
 maybe chmod 0600 'NetworkManager/system-connections/mario'
 maybe chmod 0600 'NetworkManager/system-connections/moellein'
@@ -1175,8 +1176,6 @@ maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd'
 maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd'
 maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O'
 maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O'
-maybe chgrp 'lp' 'cups/ppd/TEST_linux_a5xv.ppd'
-maybe chmod 0640 'cups/ppd/TEST_linux_a5xv.ppd'
 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/printers.conf.O'
@@ -2573,6 +2572,7 @@ maybe chmod 0755 'systemd/system/rescue.target.wants'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-49.mount'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-50.mount'
 maybe chmod 0644 'systemd/system/snap-core-5548.mount'
+maybe chmod 0644 'systemd/system/snap-core-5662.mount'
 maybe chmod 0644 'systemd/system/snap.canonical-livepatch.canonical-livepatchd.service'
 maybe chmod 0755 'systemd/system/sockets.target.wants'
 maybe chmod 0755 'systemd/system/sysinit.target.wants'

diff --git a/NetworkManager/system-connections/Zum Riedensee b/NetworkManager/system-connections/Zum Riedensee
new file mode 100644 (file)
index 0000000..3197cc0
--- /dev/null
+++ b/NetworkManager/system-connections/Zum Riedensee
@@ -0,0 +1,25 @@
+[connection]
+id=Zum Riedensee
+uuid=43f7ad8b-aba3-46e6-9d9a-ed1cf6cf280e
+type=wifi
+permissions=
+
+[wifi]
+mac-address=F4:8C:50:B7:F4:94
+mac-address-blacklist=
+mode=infrastructure
+ssid=Zum Riedensee
+
+[wifi-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk=riedensee
+
+[ipv4]
+dns-search=
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+dns-search=
+method=auto

diff --git a/cups/ppd/TEST_linux_a5xv.ppd b/cups/ppd/TEST_linux_a5xv.ppd
deleted file mode 100644 (file)
index 28e312e..0000000
--- a/cups/ppd/TEST_linux_a5xv.ppd
+++ /dev/null
@@ -1,163 +0,0 @@
-*PPD-Adobe: "4.3"
-*%
-*% "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $"
-*%
-*%   Sample Postscript driver PPD file for the Common UNIX Printing
-*%   System (CUPS).
-*%
-*%   Michael Goffioul <goffioul@emic.ucl.ac.be>
-*%
-*APRemoteQueueID: ""
-*FormatVersion:        "4.3"
-*FileVersion:  "1.1"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PCFileName:   "PSTSCRPT.PPD"
-*Manufacturer: "Postscript"
-*Product:      "(CUPS v1.1)"
-*ModelName:     "Generic postscript printer"
-*ShortNickName: "Generic postscript printer"
-*NickName:      "Remote printer: Generic postscript printer"
-*PSVersion:    "(2017.000) 0"
-*LanguageLevel:        "2"
-*ColorDevice:  False
-*DefaultColorSpace: Gray
-*FileSystem:   False
-*Throughput:   "8"
-*LandscapeOrientation: Plus90
-*VariablePaperSize: False
-*TTRasterizer: Type42
-
-*UIConstraints: *PageSize Executive *InputSlot Manual
-*UIConstraints: *PageSize Letter *InputSlot Manual
-*UIConstraints: *PageSize Legal *InputSlot Manual
-*UIConstraints: *PageSize A4 *InputSlot Manual
-*UIConstraints: *PageSize A5 *InputSlot Manual
-*UIConstraints: *PageSize B5 *InputSlot Manual
-
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: Letter
-*PageSize Letter/Letter:       "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal:         "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4:               "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
-*PageSize A5/A5:               "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
-*PageSize B5/B5 (JIS):         "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-*PageSize Env10/Envelope #10:  "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
-*PageSize EnvC5/Envelope C5:   "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-*PageSize EnvDL/Envelope DL:   "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
-*CloseUI: *PageSize
-
-*OpenUI *PageRegion: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/Letter:     "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal:       "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4:             "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
-*PageRegion A5/A5:             "<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
-*PageRegion B5/B5 (JIS):       "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-*PageRegion Env10/Envelope #10:        "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
-*CloseUI: *PageRegion
-
-*DefaultImageableArea: Letter
-*ImageableArea Letter/US Letter:       "18 36 594 756"
-*ImageableArea Legal/US Legal:         "18 36 594 972"
-*ImageableArea Executive/Executive:    "18 36 504 684"
-*ImageableArea A4/A4:                  "18 36 577 806"
-*ImageableArea A5/A5:                  "18 36 403 559"
-*ImageableArea B5/JIS B5:              "18 36 498 693"
-*ImageableArea EnvISOB5/B5 (ISO):      "18 36 463 673"
-*ImageableArea Env10/Com-10:           "18 36 279 648"
-*ImageableArea EnvC5/EnvC5:            "18 36 441 613"
-*ImageableArea EnvDL/EnvDL:            "18 36 294 588"
-*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504"
-
-*DefaultPaperDimension: Letter
-*PaperDimension Letter/Letter:         "612 792"
-*PaperDimension Legal/Legal:           "612 1008"
-*PaperDimension Executive/Executive:   "522 756"
-*PaperDimension A4/A4:                 "595 842"
-*PaperDimension A5/A5:                 "421 595"
-*PaperDimension B5/B5 (JIS):           "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 *InputSlot/Media Source: PickOne
-*OrderDependency: 10 AnySetup *InputSlot
-*DefaultInputSlot: Default
-*InputSlot Default/Default: ""
-*InputSlot Tray1/Tray 1: "<</ManualFeed false /MediaPosition 3>>setpagedevice"
-*InputSlot Tray2/Tray 2: "<</ManualFeed false /MediaPosition 0>>setpagedevice"
-*InputSlot Tray3/Tray 3: "<</ManualFeed false /MediaPosition 1>>setpagedevice"
-*InputSlot Manual/Manual Feed: "<</ManualFeed true /MediaPosition 3>>setpagedevice"
-*CloseUI: *InputSlot
-
-*OpenUI *Resolution/Output Resolution: PickOne
-*OrderDependency: 20 AnySetup *Resolution
-*DefaultResolution: 300dpi
-*Resolution 150dpi/150 DPI: "<</HWResolution[150 150]>>setpagedevice"
-*Resolution 300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice"
-*Resolution 600dpi/600 DPI: "<</HWResolution[600 600]>>setpagedevice"
-*Resolution 1200dpi/1200 DPI: "<</HWResolution[1200 1200]>>setpagedevice"
-*Resolution 2400dpi/2400 DPI: "<</HWResolution[2400 2400]>>setpagedevice"
-*CloseUI: *Resolution
-
-*OpenUI *Duplex/Double-Sided Printing: PickOne
-*OrderDependency: 20 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/Long Edge (Standard): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/Short Edge (Flip): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI:       *Duplex
-
-*DefaultFont: Courier
-*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
-*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
-*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
-*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
-*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
-*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
-*Font Bookman-Light: Standard "(001.004S)" Standard ROM
-*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
-*Font Courier: Standard "(002.004S)" Standard ROM
-*Font Courier-Bold: Standard "(002.004S)" Standard ROM
-*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
-*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
-*Font Helvetica: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
-*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
-*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
-*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
-*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
-*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
-*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
-*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
-*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
-*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
-*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
-*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
-*Font Symbol: Special "(001.007S)" Special ROM
-*Font Times-Bold: Standard "(001.007S)" Standard ROM
-*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
-*Font Times-Italic: Standard "(001.007S)" Standard ROM
-*Font Times-Roman: Standard "(001.007S)" Standard ROM
-*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
-*Font ZapfDingbats: Special "(001.004S)" Standard ROM
-*%
-*% End of "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $".
-*%
-*cupsFilter: "*/* 0 -"

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index fc1bf69e872d4577e007b0355ca5e7975edf3dac..d0c41d83f3587cf2515a2e69969d159e7feff12a 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -19,6 +19,26 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer Brother_MFC_J4410DW_Hans_J_rgens_MacBook_Pro>
+UUID urn:uuid:d63ef8a7-c2f3-365d-7555-373ac03cefa0
+Info Brother MFC-J4410DW
+Location 
+MakeModel Remote printer: Brother MFC-J4410DW CUPS
+DeviceURI implicitclass:Brother_MFC_J4410DW_Hans_J_rgens_MacBook_Pro
+State Idle
+StateTime 1539935440
+ConfigTime 1539935440
+Type 67153950
+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-Color-LaserJet-MFP-M277dw>
 UUID urn:uuid:c09d676f-8b76-378b-697b-94d328051a32
 Info HP Color LaserJet MFP M277dw
@@ -37,3 +57,23 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer HP_Officejet_Pro_8610_669BB7_>
+UUID urn:uuid:4cbe1df5-40ff-32f7-513d-39a10a3ec33d
+Info 
+Location 
+MakeModel Officejet Pro 8610
+DeviceURI ipp://HPA02BB8669BB7.local:631/ipp/print
+State Idle
+StateTime 1539934301
+ConfigTime 1539934303
+Type 4188
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>

diff --git a/systemd/system/multi-user.target.wants/snap-core-5662.mount b/systemd/system/multi-user.target.wants/snap-core-5662.mount
new file mode 120000 (symlink)
index 0000000..1e52946
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-core-5662.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core-5662.mount
\ No newline at end of file

diff --git a/systemd/system/snap-core-5662.mount b/systemd/system/snap-core-5662.mount
new file mode 100644 (file)
index 0000000..8152463
--- /dev/null
+++ b/systemd/system/snap-core-5662.mount
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount unit for core, revision 5662
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/core_5662.snap
+Where=/snap/core/5662
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+
+[Install]
+WantedBy=multi-user.target