snappy-hwe-snaps

Merge ~morphis/snappy-hwe-snaps/+git/network-manager:fix-state-dir-output into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

  1. Git
  2. lp:~morphis/snappy-hwe-snaps/+git/network-manager
  3. fix-state-dir-output
  4. Merge into network-manager/xenial/1.2.2
Proposed by Simon Fels
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 30b2b99c70507aaf728a8e0cf8a0ad5319f3fbf1
Merge reported by: Simon Fels
Merged at revision: not available
Proposed branch: ~morphis/snappy-hwe-snaps/+git/network-manager:fix-state-dir-output
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Diff against target: 13 lines (+1/-1)
1 file modified
src/nm-core-utils.c (+1/-1)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Tony Espy Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+308885@code.launchpad.net

Description of the change

Print out correct path for the IPv6 secret key

This doesn't affect any runtime behavior and is just fixing the log output to be correct. Current output is

Oct 20 06:36:43 localhost NetworkManager[1147]: <warn> [1476945403.2249] device (eth0): linklocal6: failed to generate an address: Can't write /usr/var/lib/NetworkManager/secret_key: Failed to create file '/usr/var/lib/NetworkManager/secret_key.1G2PPY': No such file or directory

For the actual read/write operation network-manager already uses the correct path.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:30b2b99c70507aaf728a8e0cf8a0ad5319f3fbf1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/191/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/93/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/191/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tony Espy (awe) :
review: Approve
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
2index fbe3b3b..aea80da 100644
3--- a/src/nm-core-utils.c
4+++ b/src/nm-core-utils.c
5@@ -2657,7 +2657,7 @@ nm_utils_secret_key_read (gsize *out_key_len, GError **error)
6 key_mask = umask (0077);
7 if (read (urandom, secret_key, key_len) == key_len) {
8 if (!g_file_set_contents (secret_key_path, (char *) secret_key, key_len, error)) {
9- g_prefix_error (error, "Can't write " NMSTATEDIR "/secret_key: ");
10+ g_prefix_error (error, "Can't write %s/secret_key: ", secret_key_path);
11 key_len = 0;
12 }
13 } else {

Subscribers

People subscribed via source and target branches