saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 6231fbceab85d23bc59be2c13890ced485561161..1cdd1d3afdbcd927e7c7abecb1534dbdc64d0b9e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3284,8 +3284,8 @@ maybe chmod 0644 'systemd/system/snap-ferdi-225.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d28\x2d1804-161.mount'
 maybe chmod 0644 'systemd/system/snap-gtk\x2dcommon\x2dthemes-1534.mount'
 maybe chmod 0644 'systemd/system/snap-gtk\x2dcommon\x2dthemes-1535.mount'
-maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-312.mount'
 maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-315.mount'
+maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-321.mount'
 maybe chmod 0755 'systemd/system/snapd.mounts.target.wants'
 maybe chmod 0755 'systemd/system/sockets.target.wants'
 maybe chmod 0755 'systemd/system/sysinit.target.wants'

diff --git a/cups/printers.conf b/cups/printers.conf
index 9f20b36130a8eafa3aaaa91f7d3e721245cc65e6..f766885e38507d7c70a544c82f882f2b26ff7b20 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -33,7 +33,7 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1677957499
+StateTime 1678302800
 ConfigTime 1660637240
 Reason wifi-not-configured-report
 Type 8425500

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 9c9aac766f5309b8fb05316b94c315247842f049..5de79f253312ffc84594868e0d661acbfd02f5b7 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -33,9 +33,10 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1677957359
+StateTime 1678302761
 ConfigTime 1660637240
 Reason wifi-not-configured-report
+Reason cups-waiting-for-job-completed
 Type 8425500
 Accepting Yes
 Shared No

diff --git a/systemd/system/default.target.wants/snap-pycharm\x2dcommunity-312.mount b/systemd/system/default.target.wants/snap-pycharm\x2dcommunity-312.mount
deleted file mode 120000 (symlink)
index 5d423f9..0000000
--- a/systemd/system/default.target.wants/snap-pycharm\x2dcommunity-312.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-pycharm\x2dcommunity-312.mount
\ No newline at end of file

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

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

diff --git a/systemd/system/snap-pycharm\x2dcommunity-312.mount b/systemd/system/snap-pycharm\x2dcommunity-312.mount
deleted file mode 100644 (file)
index e5352e1..0000000
--- a/systemd/system/snap-pycharm\x2dcommunity-312.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mount unit for pycharm-community, revision 312
-Before=snapd.service
-After=zfs-mount.service
-
-[Mount]
-What=/var/lib/snapd/snaps/pycharm-community_312.snap
-Where=/snap/pycharm-community/312
-Type=squashfs
-Options=nodev,ro,x-gdu.hide,x-gvfs-hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=default.target multi-user.target

diff --git a/systemd/system/snap-pycharm\x2dcommunity-321.mount b/systemd/system/snap-pycharm\x2dcommunity-321.mount
new file mode 100644 (file)
index 0000000..d760253
--- /dev/null
+++ b/systemd/system/snap-pycharm\x2dcommunity-321.mount
@@ -0,0 +1,16 @@
+[Unit]
+Description=Mount unit for pycharm-community, revision 321
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+Before=local-fs.target
+
+[Mount]
+What=/var/lib/snapd/snaps/pycharm-community_321.snap
+Where=/snap/pycharm-community/321
+Type=squashfs
+Options=nodev,ro,x-gdu.hide,x-gvfs-hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=snapd.mounts.target
+WantedBy=multi-user.target

diff --git a/systemd/system/snapd.mounts.target.wants/snap-pycharm\x2dcommunity-321.mount b/systemd/system/snapd.mounts.target.wants/snap-pycharm\x2dcommunity-321.mount
new file mode 120000 (symlink)
index 0000000..2003257
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-pycharm\x2dcommunity-321.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-pycharm\x2dcommunity-321.mount
\ No newline at end of file