saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index abb87ae62ea044dcdd3cad040cda9ac88bb3e23d..d1f5831fa33567ad1c42363532a957dea4f4553b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3297,12 +3297,12 @@ maybe chmod 0755 'systemd/system/network-pre.target.wants'
 maybe chmod 0755 'systemd/system/oem-config.service.wants'
 maybe chmod 0755 'systemd/system/paths.target.wants'
 maybe chmod 0755 'systemd/system/printer.target.wants'
-maybe chmod 0644 'systemd/system/snap-atom-257.mount'
 maybe chmod 0644 'systemd/system/snap-atom-258.mount'
+maybe chmod 0644 'systemd/system/snap-atom-259.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-9436.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-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/NetworkManager/system-connections/moellein b/NetworkManager/system-connections/moellein
index 9de7fb7abec476158463bfe1a30cd68dec868f4b..1a1d0667abdd5fb4de31a0ad86dd29155131e2b7 100644 (file)
--- a/NetworkManager/system-connections/moellein
+++ b/NetworkManager/system-connections/moellein
@@ -3,22 +3,17 @@ id=moellein
 uuid=d8c88d94-378a-4373-98ce-79a7bf9e431b
 type=wifi
 permissions=
-secondaries=
-timestamp=1509037944
+timestamp=1597345768
 
 [wifi]
 mac-address=F4:8C:50:B7:F4:94
 mac-address-blacklist=
-mac-address-randomization=0
 mode=infrastructure
-seen-bssids=CC:CE:1E:25:62:50;7A:8A:20:22:4F:CE;78:8A:20:21:4F:AA;CC:CE:1E:AE:62:05;CC:CE:1E:AE:62:06;BC:05:43:2B:06:55;CC:CE:1E:25:62:03;7A:8A:20:22:4E:61;C0:25:06:F9:91:58;C0:25:06:F9:91:59;7A:8A:20:22:4E:E5;78:8A:20:21:4F:CE;7A:8A:20:22:4E:F5;CC:CE:1E:23:0A:B1;CC:CE:1E:EA:BF:8A;78:8A:20:21:4E:61;CC:CE:1E:EA:BF:8B;CC:CE:1E:25:62:4F;78:8A:20:21:4E:E5;5C:49:79:F3:BF:4C;78:8A:20:21:4E:F5;CC:CE:1E:25:62:02;CC:CE:1E:23:5C:52;F4:06:8D:D8:99:45;7A:8A:20:22:4F:AA;F4:06:8D:D8:99:44;C8:0E:14:28:2B:C8;CC:CE:1E:23:5C:51;C8:0E:14:28:2B:C7;
+seen-bssids=5C:49:79:F3:BF:4C;66:70:02:AE:79:96;78:8A:20:21:4E:61;78:8A:20:21:4E:E5;78:8A:20:21:4E:F5;78:8A:20:21:4F:AA;78:8A:20:21:4F:CE;78:8A:20:22:4E:61;78:8A:20:5A:AB:CB;78:8A:20:5B:AB:CB;7A:8A:20:22:4E:61;7A:8A:20:22:4E:E5;7A:8A:20:22:4E:F5;7A:8A:20:22:4F:AA;7A:8A:20:22:4F:CE;7A:8A:20:5B:AB:CB;BC:05:43:2B:06:55;C0:25:06:F9:91:58;C0:25:06:F9:91:59;C8:0E:14:28:2B:C7;C8:0E:14:28:2B:C8;CC:CE:1E:23:0A:B1;CC:CE:1E:23:5C:51;CC:CE:1E:23:5C:52;CC:CE:1E:25:62:02;CC:CE:1E:25:62:03;CC:CE:1E:25:62:4F;CC:CE:1E:25:62:50;CC:CE:1E:AE:62:05;CC:CE:1E:AE:62:06;CC:CE:1E:EA:BF:8A;CC:CE:1E:EA:BF:8B;E0:63:DA:A1:24:03;E2:63:DA:A2:24:03;F0:9F:C2:D1:03:63;F0:9F:C2:D2:03:63;F2:9F:C2:D2:03:63;F4:06:8D:D8:99:44;F4:06:8D:D8:99:45;
 ssid=moellein
 
 [wifi-security]
-group=
 key-mgmt=wpa-psk
-pairwise=
-proto=
 psk=90628227476854167809
 
 [ipv4]
@@ -30,3 +25,5 @@ addr-gen-mode=stable-privacy
 dns-search=
 ip6-privacy=0
 method=auto
+
+[proxy]

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 6d9b666e240d0ff1496b7562ce38f6040f81b455..9dd7b8204ec8767113441d3b6197436a00cebf26 100644 (file)
--- 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 99
+NextPrinterId 101
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,16 +97,16 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer hp8>
-PrinterId 98
-UUID urn:uuid:b5b6e0ad-9796-3c15-4ce6-ef07c9ce6269
+<Printer hp_LaserJet_9040_8BFB3E_>
+PrinterId 99
+UUID urn:uuid:a92c50e2-5eb3-3c19-5bbd-85acf844ae86
 Info 
 Location 
 MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp8/
+DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
 State Idle
-StateTime 1597152723
-ConfigTime 1597152723
+StateTime 1597298916
+ConfigTime 1597298916
 Type 8400988
 Accepting Yes
 Shared No

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

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

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

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

diff --git a/systemd/system/snap-atom-257.mount b/systemd/system/snap-atom-257.mount
deleted file mode 100644 (file)
index cff6cfe..0000000
--- a/systemd/system/snap-atom-257.mount
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Mount unit for atom, revision 257
-Before=snapd.service
-
-[Mount]
-What=/var/lib/snapd/snaps/atom_257.snap
-Where=/snap/atom/257
-Type=squashfs
-Options=nodev,ro,x-gdu.hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=multi-user.target

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

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

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