Merge ~morphis/snappy-hwe-snaps/+git/network-manager:f/dnsmasq-support into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

[Simon Fels]

Use correct path to place the dnsmasq runtime directory inside our snap environment

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:82928cd3179e74d706d3e0e9b0585591c77f977e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1323/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/512/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1234/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1152/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/172

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:82928cd3179e74d706d3e0e9b0585591c77f977e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1331/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/520
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1240/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1159
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/178

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

review: Approve (continuous-integration)

diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index 764aba2..321f86f 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -114,7 +114,7 @@ nm_dnsmasq_manager_new (const char *iface)
 
 	priv = NM_DNSMASQ_MANAGER_GET_PRIVATE (manager);
 	priv->iface = g_strdup (iface);
-	priv->pidfile = g_strdup_printf (RUNSTATEDIR "/nm-dnsmasq-%s.pid", iface);
+	priv->pidfile = g_strdup_printf ("%s/nm-dnsmasq-%s.pid", nm_utils_get_run_dir(), iface);
 
 	return manager;
 }