From e2d9854c91af5db81722e230d0d2a291b77a3b2a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 16 Dec 2018 13:27:33 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 ++- cups/printers.conf.O | 6 +++--- group | 2 +- group- | 1 + gshadow | 2 +- gshadow- | 1 + .../snap-canonical\\x2dlivepatch-54.mount" | 1 + .../multi-user.target.wants/snap-core-5662.mount | 1 - .../multi-user.target.wants/snap-core-6034.mount | 1 + .../system/snap-canonical\\x2dlivepatch-54.mount" | 12 ++++++++++++ .../{snap-core-5662.mount => snap-core-6034.mount} | 6 +++--- ....canonical-livepatch.canonical-livepatchd.service | 8 ++++---- 12 files changed, 30 insertions(+), 14 deletions(-) create mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-54.mount" delete mode 120000 systemd/system/multi-user.target.wants/snap-core-5662.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-6034.mount create mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-54.mount" rename systemd/system/{snap-core-5662.mount => snap-core-6034.mount} (51%) diff --git a/.etckeeper b/.etckeeper index 927033b..8f2483e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2594,9 +2594,10 @@ maybe chmod 0755 'systemd/system/paths.target.wants' maybe chmod 0755 'systemd/system/printer.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-5662.mount' +maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-54.mount' maybe chmod 0644 'systemd/system/snap-core-5742.mount' maybe chmod 0644 'systemd/system/snap-core-5897.mount' +maybe chmod 0644 'systemd/system/snap-core-6034.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/cups/printers.conf.O b/cups/printers.conf.O index c6929a1..166fa86 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -38,14 +38,14 @@ OpPolicy default ErrorPolicy retry-job -UUID urn:uuid:a4f28d9a-5ed3-33f4-5106-46e4b9055777 +UUID urn:uuid:71f2cb13-6624-38a9-4abb-e127c4350e48 Info Location MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1544185867 -ConfigTime 1544185870 +StateTime 1544860900 +ConfigTime 1544860903 Type 4188 Accepting Yes Shared No diff --git a/group b/group index 6c65e94..d2129ab 100644 --- a/group +++ b/group @@ -81,5 +81,5 @@ ntp:x:105: nvidia-persistenced:x:131: bumblebee:x:998:mhoellein,syslog alle:x:1014: -kvm:x:139: +kvm:x:139:mhoellein rdma:x:140: diff --git a/group- b/group- index 3d6cb5b..6c65e94 100644 --- a/group- +++ b/group- @@ -82,3 +82,4 @@ nvidia-persistenced:x:131: bumblebee:x:998:mhoellein,syslog alle:x:1014: kvm:x:139: +rdma:x:140: diff --git a/gshadow b/gshadow index 49659ae..6191cf1 100644 --- a/gshadow +++ b/gshadow @@ -81,5 +81,5 @@ ntp:!:: nvidia-persistenced:!:: bumblebee:!::mhoellein,syslog alle:!:: -kvm:!:: +kvm:!::mhoellein rdma:!:: diff --git a/gshadow- b/gshadow- index 76dd4d5..49659ae 100644 --- a/gshadow- +++ b/gshadow- @@ -82,3 +82,4 @@ nvidia-persistenced:!:: bumblebee:!::mhoellein,syslog alle:!:: kvm:!:: +rdma:!:: diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-54.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-54.mount" new file mode 120000 index 0000000..6738c65 --- /dev/null +++ "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-54.mount" @@ -0,0 +1 @@ +/etc/systemd/system/snap-canonical\x2dlivepatch-54.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-5662.mount b/systemd/system/multi-user.target.wants/snap-core-5662.mount deleted file mode 120000 index 1e52946..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-5662.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-5662.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-6034.mount b/systemd/system/multi-user.target.wants/snap-core-6034.mount new file mode 120000 index 0000000..b8f8c7b --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-6034.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-6034.mount \ No newline at end of file diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-54.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-54.mount" new file mode 100644 index 0000000..69faab4 --- /dev/null +++ "b/systemd/system/snap-canonical\\x2dlivepatch-54.mount" @@ -0,0 +1,12 @@ +[Unit] +Description=Mount unit for canonical-livepatch, revision 54 +Before=snapd.service + +[Mount] +What=/var/lib/snapd/snaps/canonical-livepatch_54.snap +Where=/snap/canonical-livepatch/54 +Type=squashfs +Options=nodev,ro,x-gdu.hide + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/snap-core-5662.mount b/systemd/system/snap-core-6034.mount similarity index 51% rename from systemd/system/snap-core-5662.mount rename to systemd/system/snap-core-6034.mount index 8152463..45e8f64 100644 --- a/systemd/system/snap-core-5662.mount +++ b/systemd/system/snap-core-6034.mount @@ -1,10 +1,10 @@ [Unit] -Description=Mount unit for core, revision 5662 +Description=Mount unit for core, revision 6034 Before=snapd.service [Mount] -What=/var/lib/snapd/snaps/core_5662.snap -Where=/snap/core/5662 +What=/var/lib/snapd/snaps/core_6034.snap +Where=/snap/core/6034 Type=squashfs Options=nodev,ro,x-gdu.hide diff --git a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service index bad7c2d..1223e9a 100644 --- a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service +++ b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service @@ -1,16 +1,16 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application canonical-livepatch.canonical-livepatchd -Requires=snap-canonical\x2dlivepatch-50.mount -Wants=network-online.target -After=snap-canonical\x2dlivepatch-50.mount network-online.target +Requires=snap-canonical\x2dlivepatch-54.mount +Wants=network.target +After=snap-canonical\x2dlivepatch-54.mount network.target X-Snappy=yes [Service] ExecStart=/usr/bin/snap run canonical-livepatch.canonical-livepatchd SyslogIdentifier=canonical-livepatch.canonical-livepatchd Restart=on-failure -WorkingDirectory=/var/snap/canonical-livepatch/50 +WorkingDirectory=/var/snap/canonical-livepatch/54 TimeoutStopSec=30 Type=simple -- 2.43.0