From 5af7591a1f33cef70005850fb2358aa4b8c46468 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 20 Jan 2023 23:52:35 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 ++- cups/printers.conf | 2 +- cups/printers.conf.O | 2 +- .../default.target.wants/snap-drawio-167.mount | 1 - .../snap-drawio-167.mount | 1 - .../snap-drawio-169.mount | 1 + systemd/system/snap-drawio-167.mount | 14 -------------- systemd/system/snap-drawio-169.mount | 16 ++++++++++++++++ .../snap-drawio-169.mount | 1 + 9 files changed, 22 insertions(+), 19 deletions(-) delete mode 120000 systemd/system/default.target.wants/snap-drawio-167.mount delete mode 120000 systemd/system/multi-user.target.wants/snap-drawio-167.mount create mode 120000 systemd/system/multi-user.target.wants/snap-drawio-169.mount delete mode 100644 systemd/system/snap-drawio-167.mount create mode 100644 systemd/system/snap-drawio-169.mount create mode 120000 systemd/system/snapd.mounts.target.wants/snap-drawio-169.mount diff --git a/.etckeeper b/.etckeeper index 8ece9d3..dea493b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3280,8 +3280,8 @@ maybe chmod 0644 'systemd/system/snap-core-14399.mount' maybe chmod 0644 'systemd/system/snap-core-14447.mount' maybe chmod 0644 'systemd/system/snap-core18-2654.mount' maybe chmod 0644 'systemd/system/snap-core18-2667.mount' -maybe chmod 0644 'systemd/system/snap-drawio-167.mount' maybe chmod 0644 'systemd/system/snap-drawio-168.mount' +maybe chmod 0644 'systemd/system/snap-drawio-169.mount' maybe chmod 0644 'systemd/system/snap-ferdi-211.mount' maybe chmod 0644 'systemd/system/snap-ferdi-225.mount' maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d28\x2d1804-161.mount' @@ -3289,6 +3289,7 @@ 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-310.mount' maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-312.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' maybe chmod 0755 'systemd/system/timers.target.wants' diff --git a/cups/printers.conf b/cups/printers.conf index 6cb30d6..cdf52b4 100644 --- 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 1673204362 +StateTime 1674229275 ConfigTime 1660637240 Reason wifi-not-configured-report Type 8425500 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 00acc9f..9adc342 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -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 1673204323 +StateTime 1674229236 ConfigTime 1660637240 Reason wifi-not-configured-report Reason cups-waiting-for-job-completed diff --git a/systemd/system/default.target.wants/snap-drawio-167.mount b/systemd/system/default.target.wants/snap-drawio-167.mount deleted file mode 120000 index f6d9d90..0000000 --- a/systemd/system/default.target.wants/snap-drawio-167.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-drawio-167.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-drawio-167.mount b/systemd/system/multi-user.target.wants/snap-drawio-167.mount deleted file mode 120000 index f6d9d90..0000000 --- a/systemd/system/multi-user.target.wants/snap-drawio-167.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-drawio-167.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-drawio-169.mount b/systemd/system/multi-user.target.wants/snap-drawio-169.mount new file mode 120000 index 0000000..841c142 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-drawio-169.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-drawio-169.mount \ No newline at end of file diff --git a/systemd/system/snap-drawio-167.mount b/systemd/system/snap-drawio-167.mount deleted file mode 100644 index d0511f4..0000000 --- a/systemd/system/snap-drawio-167.mount +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Mount unit for drawio, revision 167 -Before=snapd.service -After=zfs-mount.service - -[Mount] -What=/var/lib/snapd/snaps/drawio_167.snap -Where=/snap/drawio/167 -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-drawio-169.mount b/systemd/system/snap-drawio-169.mount new file mode 100644 index 0000000..140bd23 --- /dev/null +++ b/systemd/system/snap-drawio-169.mount @@ -0,0 +1,16 @@ +[Unit] +Description=Mount unit for drawio, revision 169 +After=snapd.mounts-pre.target +Before=snapd.mounts.target +Before=local-fs.target + +[Mount] +What=/var/lib/snapd/snaps/drawio_169.snap +Where=/snap/drawio/169 +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-drawio-169.mount b/systemd/system/snapd.mounts.target.wants/snap-drawio-169.mount new file mode 120000 index 0000000..841c142 --- /dev/null +++ b/systemd/system/snapd.mounts.target.wants/snap-drawio-169.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-drawio-169.mount \ No newline at end of file -- 2.39.5