Merge ~ssweeny/snappy-hwe-snaps/+git/network-manager:dhcp-leases-run into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

[Scott Sweeny]

[SNAPPY] Write DHCP lease files to /run/NetworkManager/dhcp/

Change the DHCP manager to store lease files in /run/NetworkManager/dhcp

This requires a change to the network-manager interface which landed in snapd today.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:2331dd5f46178b6bb6d0ea3bf8cfb953feeb74d3
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/151/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/52/console

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Upstream uses NMSTATEDIR for constructing the internal lease paths. Our original snappy support commit changed the code to use nm_get_state_dir().

As we're now changing this path to a writable system directory, it might be worthwhile to add a short comment explaining why this is being done, vs. using nm_utils_get_run_dir() or nm_utils_get_state_dir().

Otherwise looks good.

review: Needs Fixing

[Scott Sweeny (ssweeny)]

Done.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:275d12ba0f70753f3258dda8298609ef95974cff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/153/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/54/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[Simon Fels (morphis)]

Top-approving this now to get the development process forward. @Tony: Hope you're ok with this.

[Tony Espy (awe)]

+1, just wanted the comment added, so we're good to go.

[Tony Espy (awe)]

review: Approve

diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index 80e6523..bf2a10d 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -398,8 +398,10 @@ lease_to_ip4_config (const char *iface,
 static char *
 get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6)
 {
-	return g_strdup_printf ("%s/internal%s-%s-%s.lease",
-							nm_utils_get_state_dir(),
+    /* Store lease files in a well-known system location so they can be
+     * read by external utilities.
+     */
+	return g_strdup_printf ("/run/NetworkManager/dhcp/internal%s-%s-%s.lease",
 	                        ipv6 ? "6" : "",
 	                        uuid,
 	                        iface);