Merge ~morphis/snappy-hwe-snaps/+git/network-manager:nm-revert-dhcp-lease-storage into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

[Simon Fels]

Switch back to store DHCP leases in SNAP_DATA

This depends on https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/309847

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

PASSED: Continuous integration, rev:45a67e26c1517ecaca71f9a71f0a77081ce65421
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/246/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/148/console

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index bf2a10d..0990f3f 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -398,10 +398,8 @@ lease_to_ip4_config (const char *iface,
 static char *
 get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6)
 {
-    /* 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",
+	return g_strdup_printf ("%s/dhcp/internal%s-%s-%s.lease",
+							nm_utils_get_state_dir(),
 	                        ipv6 ? "6" : "",
 	                        uuid,
 	                        iface);