From 932c44a20c5b80de66dff1ab24530fe7beb1a37c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Thu, 2 May 2019 20:38:47 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 ++- .../system-connections/IPCAM-043457 | 25 +++++++++++++++++++ cups/printers.conf.O | 22 +--------------- .../snap-core-6405.mount | 1 - .../snap-core-6818.mount | 1 + ...p-core-6405.mount => snap-core-6818.mount} | 6 ++--- 6 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 NetworkManager/system-connections/IPCAM-043457 delete mode 120000 systemd/system/multi-user.target.wants/snap-core-6405.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-6818.mount rename systemd/system/{snap-core-6405.mount => snap-core-6818.mount} (51%) diff --git a/.etckeeper b/.etckeeper index 4dc0bcd..6443cad 100755 --- a/.etckeeper +++ b/.etckeeper @@ -147,6 +147,7 @@ maybe chmod 0600 'NetworkManager/system-connections/FRITZ!WLAN Repeater 1750E' maybe chmod 0600 'NetworkManager/system-connections/Fritz.Box RettungsIP 169.254.1.2*24' maybe chmod 0600 'NetworkManager/system-connections/G-Homa' maybe chmod 0600 'NetworkManager/system-connections/Hotel_Jalisco_1D' +maybe chmod 0600 'NetworkManager/system-connections/IPCAM-043457' maybe chmod 0600 'NetworkManager/system-connections/LaCrosseGateway_1505931' maybe chmod 0644 'NetworkManager/system-connections/NetworkManager-USRP' maybe chmod 0600 'NetworkManager/system-connections/O2' @@ -2667,9 +2668,9 @@ maybe chmod 0755 'systemd/system/printer.target.wants' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-69.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-71.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-74.mount' -maybe chmod 0644 'systemd/system/snap-core-6405.mount' maybe chmod 0644 'systemd/system/snap-core-6531.mount' maybe chmod 0644 'systemd/system/snap-core-6673.mount' +maybe chmod 0644 'systemd/system/snap-core-6818.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/IPCAM-043457 b/NetworkManager/system-connections/IPCAM-043457 new file mode 100644 index 0000000..14d9744 --- /dev/null +++ b/NetworkManager/system-connections/IPCAM-043457 @@ -0,0 +1,25 @@ +[connection] +id=IPCAM-043457 +uuid=f58bd279-1672-4101-840b-30921bd92853 +type=wifi +permissions= + +[wifi] +mac-address=F4:8C:50:B7:F4:94 +mac-address-blacklist= +mode=infrastructure +ssid=IPCAM-043457 + +[wifi-security] +auth-alg=open +key-mgmt=wpa-psk +psk=123456789 + +[ipv4] +dns-search= +method=auto + +[ipv6] +addr-gen-mode=stable-privacy +dns-search= +method=auto diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 010066f..47f85d8 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -7,7 +7,7 @@ Info HP LaserJet M806 MakeModel HP LaserJet M806 Postscript (recommended) DeviceURI socket://172.17.6.105:9100 State Idle -StateTime 1545643565 +StateTime 1556620716 ConfigTime 1526624974 Type 8433876 Accepting Yes @@ -37,23 +37,3 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job - -UUID urn:uuid:97ec4e7d-458e-37b3-45ea-9d413c617897 -Info TEST -Location -MakeModel Remote printer: Generic postscript printer -DeviceURI implicitclass:TEST_linux_a5xv -State Idle -StateTime 1556200561 -ConfigTime 1556200561 -Type 4182 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true - diff --git a/systemd/system/multi-user.target.wants/snap-core-6405.mount b/systemd/system/multi-user.target.wants/snap-core-6405.mount deleted file mode 120000 index f45fc9c..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-6405.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-6405.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-6818.mount b/systemd/system/multi-user.target.wants/snap-core-6818.mount new file mode 120000 index 0000000..76b2bf3 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-6818.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-6818.mount \ No newline at end of file diff --git a/systemd/system/snap-core-6405.mount b/systemd/system/snap-core-6818.mount similarity index 51% rename from systemd/system/snap-core-6405.mount rename to systemd/system/snap-core-6818.mount index 83d8ea1..5548308 100644 --- a/systemd/system/snap-core-6405.mount +++ b/systemd/system/snap-core-6818.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for core, revision 6405 +Description=Mount unit for core, revision 6818 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/core_6405.snap -Where=/snap/core/6405 +What=/var/lib/snapd/snaps/core_6818.snap +Where=/snap/core/6818 Type=squashfs Options=nodev,ro,x-gdu.hide -- 2.43.0