Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:use-auto-import into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-1.10

[Alfonso Sanchez-Beato]

Remove patches from the debian folder
We take them from snap-patch now.

Add phony part to stage compiled packages

Remove version-script
version-script is now deprecated.

Add patches specific to the NM snap to snap-patch

Follow applied branches from auto-import repos

tests: run iptables from core snap now

Set rc-manager=symlink for UC18 and later
Otherwise, NM will call resolvconf even though it fails if UC version is
newer than 16. To properly set DNS we need to set both dns and
rc-manager options, but we were doing this only for the former. However,
this did not have adverse effects as, as said, the call to resolvconf
failed, while systemd-resolved was properly updated.

Do not call dhcp-lease-mover anymore
As it was not actually working anymore since we were not staging inotify
anymore since a while.

Specify explicitly copyrights to include
Previously there were copyright files included from non-staged
packages.

Add unstage.txt file
This file contains a list of debian package that we are not actually
staging, although snapcraft adds them to manifest.yaml. CI now
recognizes this file, and manually removes the listed packages from the
manifest when releasing a snap to the store.

Do not stage iptables/xtables
iptables and all needed libraries are now included in the core18 snap,
since revision 1049 (2019-06-27).

Do not stage libs already in core18
The libraries were not really included finally in the snap, but they
were triggering CVE warnings from the review tools that did not actually
apply.

snap: call netplan apply using DBus
Use DBus netplan interface to re-start network services after setting
NetworkManager as the default renderer.

snap: add network-setup-control interface
Add network-setup-control interface so we can call 'netplan apply' from
the snap.

Remove patches from the debian folder
We take them from snap-patch now.

Add phony part to stage compiled packages

Remove version-script
version-script is now deprecated.

Add patches specific to the NM snap to snap-patch

Follow applied branches from auto-import repos

tests: run iptables from core snap now

Set rc-manager=symlink for UC18 and later
Otherwise, NM will call resolvconf even though it fails if UC version is
newer than 16. To properly set DNS we need to set both dns and
rc-manager options, but we were doing this only for the former. However,
this did not have adverse effects as, as said, the call to resolvconf
failed, while systemd-resolved was properly updated.

Do not call dhcp-lease-mover anymore
As it was not actually working anymore since we were not staging inotify
anymore since a while.

Specify explicitly copyrights to include
Previously there were copyright files included from non-staged
packages.

Add unstage.txt file
This file contains a list of debian package that we are not actually
staging, although snapcraft adds them to manifest.yaml. CI now
recognizes this file, and manually removes the listed packages from the
manifest when releasing a snap to the store.

Do not stage iptables/xtables
iptables and all needed libraries are now included in the core18 snap,
since revision 1049 (2019-06-27).

Do not stage libs already in core18
The libraries were not really included finally in the snap, but they
were triggering CVE warnings from the review tools that did not actually
apply.

snap: call netplan apply using DBus
Use DBus netplan interface to re-start network services after setting
NetworkManager as the default renderer.

snap: add network-setup-control interface
Add network-setup-control interface so we can call 'netplan apply' from
the snap.

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

PASSED: Continuous integration, rev:08a1cbcec51b16ebdc07f14e91c63230a4c5e4e7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/474/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/505
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/505
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/505
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/505
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1297
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1039
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1087/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/474/rebuild

review: Approve (continuous-integration)

diff --git a/debian/patches/disable-libnm-glib-test-devices-array.patch b/debian/patches/disable-libnm-glib-test-devices-array.patch
deleted file mode 100644
index e847fc5..0000000
--- a/debian/patches/disable-libnm-glib-test-devices-array.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nm/libnm-glib/tests/test-nm-client.c
-===================================================================
---- nm.orig/libnm-glib/tests/test-nm-client.c
-+++ nm/libnm-glib/tests/test-nm-client.c
-@@ -1135,7 +1135,7 @@ main (int argc, char **argv)
- 	g_test_add_func ("/libnm-glib/device-added", test_device_added);
- 	g_test_add_func ("/libnm-glib/wifi-ap-added-removed", test_wifi_ap_added_removed);
- 	g_test_add_func ("/libnm-glib/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
--	g_test_add_func ("/libnm-glib/devices-array", test_devices_array);
-+	/* g_test_add_func ("/libnm-glib/devices-array", test_devices_array); */
- 	g_test_add_func ("/libnm-glib/client-manager-running", test_client_manager_running);
- 	g_test_add_func ("/libnm/connection/invalid", test_connection_invalid);
- 
diff --git a/debian/patches/set-ld-library-path-for-iptables.patch b/debian/patches/set-ld-library-path-for-iptables.patch
deleted file mode 100644
index 065816c..0000000
--- a/debian/patches/set-ld-library-path-for-iptables.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?= <[e-mail]>
-Date: Thu, 18 Jul 2019 17:48:39 +0200
-Subject: [PATCH] snap: pass NM env vars when calling iptables
-
-This is necessary so LD_LIBRARY_PATH is passed down to iptables so it is
-able to find the libraries included in the snap package.
----
- src/nm-act-request.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/nm-act-request.c b/src/nm-act-request.c
-index 87070794..bcf3e0bb 100644
---- a/src/nm-act-request.c
-+++ b/src/nm-act-request.c
-@@ -309,7 +309,6 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
- 	/* Send the rules to iptables */
- 	for (iter = list; iter; iter = g_slist_next (iter)) {
- 		ShareRule *rule = (ShareRule *) iter->data;
--		char *envp[1] = { NULL };
- 		gs_strfreev char **argv = NULL;
- 		gs_free char *cmd = NULL;
- 
-@@ -327,7 +326,7 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
- 			GError *error = NULL;
- 
- 			nm_log_info (LOGD_SHARING, "Executing: %s", cmd);
--			if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
-+			if (!g_spawn_sync ("/", argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- 			                   NULL, NULL, NULL, NULL, &status, &error)) {
- 				nm_log_warn (LOGD_SHARING, "Error executing command: %s",
- 				             error->message);
--- 
-2.17.1
-
diff --git a/snap-common/bin/networkmanager b/snap-common/bin/networkmanager
index bb8131b..7d5315f 100755
--- a/snap-common/bin/networkmanager
+++ b/snap-common/bin/networkmanager
@@ -55,7 +55,8 @@ dns_conf_file="$SNAP_DATA"/conf.d/10-dns.conf
 if [ "$(get_series_major_version)" = "16" ]; then
     printf "[main]\ndns=default\nrc-manager=resolvconf\n" > "$dns_conf_file"
 else
-    printf "[main]\ndns=systemd-resolved\n" > "$dns_conf_file"
+    printf "[main]\ndns=systemd-resolved\nrc-manager=symlink\n" > \
+           "$dns_conf_file"
 fi
 
 # HACK: Until we've fixed probert to look in $SNAP_DATA/state/dhcp or
@@ -63,7 +64,8 @@ fi
 # our lease files and copy all over when something has changed. This
 # background process gets stopped when our systemd service unit gets
 # stopped.
-"$SNAP"/bin/dhcp-lease-mover &
+# Do not call: dhcp-lease-mover fails as we do not stage inotify anymore
+#"$SNAP"/bin/dhcp-lease-mover &
 
 # Identify if we are in debug mode or not
 LOG_LEVEL=INFO
diff --git a/snap-common/bin/snap-config.sh b/snap-common/bin/snap-config.sh
index 7107a2c..647f859 100644
--- a/snap-common/bin/snap-config.sh
+++ b/snap-common/bin/snap-config.sh
@@ -159,11 +159,15 @@ _switch_defaultrenderer() {
     if [ "$1" = true ] || [ "$1" = yes ]; then
         if [ ! -f "$path" ]; then
             printf "network:\n  renderer: NetworkManager\n" > "$path"
-            # TODO When implemented by snapd, call netplan apply
+            dbus-send --system --type=method_call --print-reply \
+                      --dest=io.netplan.Netplan /io/netplan/Netplan \
+                      io.netplan.Netplan.Apply
         fi
     elif [ -f "$path" ]; then
         rm -f "$path"
-        # TODO When implemented by snapd, call netplan apply
+        dbus-send --system --type=method_call --print-reply \
+                  --dest=io.netplan.Netplan /io/netplan/Netplan \
+                  io.netplan.Netplan.Apply
     fi
 }
 
diff --git a/debian/patches/Support-for-WoWLAN.patch b/snap-patch/networkmanager/0001-Support-for-WoWLAN.patch
similarity index 90%
rename from debian/patches/Support-for-WoWLAN.patch
rename to snap-patch/networkmanager/0001-Support-for-WoWLAN.patch
index 094f6c8..b1ae2c2 100644
--- a/debian/patches/Support-for-WoWLAN.patch
+++ b/snap-patch/networkmanager/0001-Support-for-WoWLAN.patch
@@ -1,7 +1,8 @@
-From: =?utf-8?q?Alfonso_S=C3=A1nchez-Beato?=
+From 705afc81b686388c4f5e5cf1d3e3fb5bd29a7227 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
  <[e-mail]>
 Date: Fri, 13 Jul 2018 11:54:30 +0200
-Subject: Support for WoWLAN
+Subject: [PATCH 1/6] Support for WoWLAN
 
 This add supports for WoWLAN by backporting upstream patches:
 
@@ -17,28 +18,28 @@ c6e40215e devices: restore past WoWLAN when disconnecting wifi
 a3289400d wifi: ensure wake-on-wlan restore only acts once
 2c3a14fed platform/wifi: drop *_get_wowlan()
 ---
- clients/common/nm-meta-setting-desc.c  |  14 ++++
+ clients/common/nm-meta-setting-desc.c  |  14 +++
  clients/common/settings-docs.c         |   1 +
  clients/common/settings-docs.c.in      |   1 +
- libnm-core/nm-setting-wireless.c       |  72 +++++++++++++++++
- libnm-core/nm-setting-wireless.h       |  46 +++++++++++
+ libnm-core/nm-setting-wireless.c       |  72 +++++++++++++
+ libnm-core/nm-setting-wireless.h       |  46 ++++++++
  libnm/libnm.ver                        |   2 +
- src/devices/wifi/nm-device-wifi.c      | 102 +++++++++++++++++++++++-
- src/nm-manager.c                       |  27 ++++---
- src/platform/nm-linux-platform.c       |  19 ++++-
- src/platform/nm-platform.c             |  20 +++++
- src/platform/nm-platform.h             |   5 ++
- src/platform/wifi/wifi-utils-nl80211.c | 139 ++++++++++++++++++++++++---------
+ src/devices/wifi/nm-device-wifi.c      | 102 +++++++++++++++++-
+ src/nm-manager.c                       |  27 +++--
+ src/platform/nm-linux-platform.c       |  19 +++-
+ src/platform/nm-platform.c             |  20 ++++
+ src/platform/nm-platform.h             |   5 +
+ src/platform/wifi/wifi-utils-nl80211.c | 139 ++++++++++++++++++-------
  src/platform/wifi/wifi-utils-private.h |   8 +-
- src/platform/wifi/wifi-utils.c         |  28 ++++---
+ src/platform/wifi/wifi-utils.c         |  28 +++--
  src/platform/wifi/wifi-utils.h         |   7 +-
  15 files changed, 425 insertions(+), 66 deletions(-)
 
 diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
-index 94404e9..21763a8 100644
+index addcdef71..eeca822c8 100644
 --- a/clients/common/nm-meta-setting-desc.c
 +++ b/clients/common/nm-meta-setting-desc.c
-@@ -7271,6 +7271,20 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
+@@ -7279,6 +7279,20 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
  			.typ_flags =                NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT,
  		),
  	),
@@ -60,7 +61,7 @@ index 94404e9..21763a8 100644
  };
  
 diff --git a/clients/common/settings-docs.c b/clients/common/settings-docs.c
-index bf5753c..911164a 100644
+index bf5753c57..911164acc 100644
 --- a/clients/common/settings-docs.c
 +++ b/clients/common/settings-docs.c
 @@ -21,6 +21,7 @@
@@ -72,7 +73,7 @@ index bf5753c..911164a 100644
  #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
  #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
 diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in
-index bf5753c..911164a 100644
+index b022b2d9e..992d3fa41 100644
 --- a/clients/common/settings-docs.c.in
 +++ b/clients/common/settings-docs.c.in
 @@ -21,6 +21,7 @@
@@ -84,7 +85,7 @@ index bf5753c..911164a 100644
  #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
  #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
 diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
-index 0a3915b..7500c97 100644
+index 0a3915bfc..7500c9740 100644
 --- a/libnm-core/nm-setting-wireless.c
 +++ b/libnm-core/nm-setting-wireless.c
 @@ -63,6 +63,7 @@ typedef struct {
@@ -207,7 +208,7 @@ index 0a3915b..7500c97 100644
 +		                    G_PARAM_STATIC_STRINGS));
  }
 diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
-index b0ef475..4c1850f 100644
+index b0ef47568..4c1850fbb 100644
 --- a/libnm-core/nm-setting-wireless.h
 +++ b/libnm-core/nm-setting-wireless.h
 @@ -41,6 +41,48 @@ G_BEGIN_DECLS
@@ -278,7 +279,7 @@ index b0ef475..4c1850f 100644
  
  #endif /* __NM_SETTING_WIRELESS_H__ */
 diff --git a/libnm/libnm.ver b/libnm/libnm.ver
-index 7646a93..3376848 100644
+index 6e0d9277d..e2d3755d9 100644
 --- a/libnm/libnm.ver
 +++ b/libnm/libnm.ver
 @@ -1276,6 +1276,8 @@ global:
@@ -291,7 +292,7 @@ index 7646a93..3376848 100644
  	nm_tc_action_equal;
  	nm_tc_action_get_attribute;
 diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
-index bf02109..e06aa32 100644
+index bf021095a..e06aa328a 100644
 --- a/src/devices/wifi/nm-device-wifi.c
 +++ b/src/devices/wifi/nm-device-wifi.c
 @@ -119,6 +119,8 @@ typedef struct {
@@ -468,10 +469,10 @@ index bf02109..e06aa32 100644
  	parent_class->state_changed = device_state_changed;
  
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index e60b6c6..fc8a97e 100644
+index 09dc8fa6c..c34401ec1 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -1315,6 +1315,12 @@ _parent_notify_changed (NMManager *self,
+@@ -1319,6 +1319,12 @@ _parent_notify_changed (NMManager *self,
  	}
  }
  
@@ -484,7 +485,7 @@ index e60b6c6..fc8a97e 100644
  static void
  remove_device (NMManager *self,
                 NMDevice *device,
-@@ -1324,14 +1330,19 @@ remove_device (NMManager *self,
+@@ -1328,14 +1334,19 @@ remove_device (NMManager *self,
  	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
  	gboolean unmanage = FALSE;
  
@@ -509,7 +510,7 @@ index e60b6c6..fc8a97e 100644
  			/* the device is already gone. Unmanage it. */
  			unmanage = TRUE;
  		}
-@@ -4763,12 +4774,6 @@ done:
+@@ -4767,12 +4778,6 @@ done:
  	g_clear_object (&subject);
  }
  
@@ -523,7 +524,7 @@ index e60b6c6..fc8a97e 100644
  sleep_devices_add (NMManager *self, NMDevice *device, gboolean suspending)
  {
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index e5961c7..a061fc3 100644
+index e5961c7ec..a061fc396 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
 @@ -6119,6 +6119,21 @@ wifi_indicate_addressing_running (NMPlatform *platform, int ifindex, gboolean ru
@@ -567,7 +568,7 @@ index e5961c7..a061fc3 100644
  	platform_class->mesh_get_channel = mesh_get_channel;
  	platform_class->mesh_set_channel = mesh_set_channel;
 diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index c7ed90e..7387a1d 100644
+index c7ed90e3f..7387a1dad 100644
 --- a/src/platform/nm-platform.c
 +++ b/src/platform/nm-platform.c
 @@ -2767,6 +2767,26 @@ nm_platform_wifi_indicate_addressing_running (NMPlatform *self, int ifindex, gbo
@@ -598,7 +599,7 @@ index c7ed90e..7387a1d 100644
  nm_platform_mesh_get_channel (NMPlatform *self, int ifindex)
  {
 diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
-index f6bf02b..0c167ee 100644
+index f6bf02bf5..0c167ee57 100644
 --- a/src/platform/nm-platform.h
 +++ b/src/platform/nm-platform.h
 @@ -32,6 +32,7 @@
@@ -628,7 +629,7 @@ index f6bf02b..0c167ee 100644
  guint32     nm_platform_mesh_get_channel      (NMPlatform *self, int ifindex);
  gboolean    nm_platform_mesh_set_channel      (NMPlatform *self, int ifindex, guint32 channel);
 diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
-index a5f25b0..3a09244 100644
+index a5f25b026..3a092440e 100644
 --- a/src/platform/wifi/wifi-utils-nl80211.c
 +++ b/src/platform/wifi/wifi-utils-nl80211.c
 @@ -495,6 +495,103 @@ nla_put_failure:
@@ -792,7 +793,7 @@ index a5f25b0..3a09244 100644
  	_LOGI (LOGD_PLATFORM | LOGD_WIFI,
  	       "(%s): using nl80211 for WiFi device control",
 diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h
-index 11a0f06..18f6131 100644
+index 11a0f060d..18f613198 100644
 --- a/src/platform/wifi/wifi-utils-private.h
 +++ b/src/platform/wifi/wifi-utils-private.h
 @@ -35,6 +35,12 @@ struct WifiData {
@@ -818,7 +819,7 @@ index 11a0f06..18f6131 100644
  
  	guint32 (*get_mesh_channel) (WifiData *data);
 diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c
-index d005212..f76bf95 100644
+index d00521212..f76bf9578 100644
 --- a/src/platform/wifi/wifi-utils.c
 +++ b/src/platform/wifi/wifi-utils.c
 @@ -115,6 +115,25 @@ wifi_utils_set_powersave (WifiData *data, guint32 powersave)
@@ -864,7 +865,7 @@ index d005212..f76bf95 100644
  wifi_utils_deinit (WifiData *data)
  {
 diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
-index 705717b..776b3c9 100644
+index 705717b07..776b3c90b 100644
 --- a/src/platform/wifi/wifi-utils.h
 +++ b/src/platform/wifi/wifi-utils.h
 @@ -25,6 +25,7 @@
@@ -890,3 +891,6 @@ index 705717b..776b3c9 100644
  
  /* OLPC Mesh-only functions */
  guint32 wifi_utils_get_mesh_channel (WifiData *data);
+-- 
+2.17.1
+
diff --git a/debian/patches/disable-libnm-glib-wifi-ap-test.patch b/snap-patch/networkmanager/0002-Disable-non-working-test-on-Jenkins-instance.patch
similarity index 55%
rename from debian/patches/disable-libnm-glib-wifi-ap-test.patch
rename to snap-patch/networkmanager/0002-Disable-non-working-test-on-Jenkins-instance.patch
index 171b6f1..45d5344 100644
--- a/debian/patches/disable-libnm-glib-wifi-ap-test.patch
+++ b/snap-patch/networkmanager/0002-Disable-non-working-test-on-Jenkins-instance.patch
@@ -1,7 +1,17 @@
-Index: build/libnm-glib/tests/test-nm-client.c
-===================================================================
---- build.orig/libnm-glib/tests/test-nm-client.c
-+++ build/libnm-glib/tests/test-nm-client.c
+From 64092ca8d88385e953229f4640de8c159a1f24da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
+ <[e-mail]>
+Date: Thu, 30 Jan 2020 13:25:51 +0100
+Subject: [PATCH 2/6] Disable non-working test on Jenkins instance
+
+---
+ libnm-glib/tests/test-nm-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
+index b6b5968b3..1fc235b56 100644
+--- a/libnm-glib/tests/test-nm-client.c
++++ b/libnm-glib/tests/test-nm-client.c
 @@ -1133,7 +1133,7 @@ main (int argc, char **argv)
  	loop = g_main_loop_new (NULL, FALSE);
  
@@ -11,3 +21,6 @@ Index: build/libnm-glib/tests/test-nm-client.c
  	g_test_add_func ("/libnm-glib/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
  	g_test_add_func ("/libnm-glib/devices-array", test_devices_array);
  	g_test_add_func ("/libnm-glib/client-manager-running", test_client_manager_running);
+-- 
+2.17.1
+
diff --git a/snap-patch/networkmanager/0003-Disable-non-working-test-on-Jenkins-instance.patch b/snap-patch/networkmanager/0003-Disable-non-working-test-on-Jenkins-instance.patch
new file mode 100644
index 0000000..cef27b8
--- /dev/null
+++ b/snap-patch/networkmanager/0003-Disable-non-working-test-on-Jenkins-instance.patch
@@ -0,0 +1,26 @@
+From 0ebaebbbeeabc45815b2ce65f408a5e6dc07af8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
+ <[e-mail]>
+Date: Thu, 30 Jan 2020 13:27:03 +0100
+Subject: [PATCH 3/6] Disable non-working test on Jenkins instance
+
+---
+ libnm-glib/tests/test-nm-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
+index 1fc235b56..36bd4085b 100644
+--- a/libnm-glib/tests/test-nm-client.c
++++ b/libnm-glib/tests/test-nm-client.c
+@@ -1135,7 +1135,7 @@ main (int argc, char **argv)
+ 	g_test_add_func ("/libnm-glib/device-added", test_device_added);
+ 	/* g_test_add_func ("/libnm-glib/wifi-ap-added-removed", test_wifi_ap_added_removed); */
+ 	g_test_add_func ("/libnm-glib/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
+-	g_test_add_func ("/libnm-glib/devices-array", test_devices_array);
++	/* g_test_add_func ("/libnm-glib/devices-array", test_devices_array); */
+ 	g_test_add_func ("/libnm-glib/client-manager-running", test_client_manager_running);
+ 	g_test_add_func ("/libnm/connection/invalid", test_connection_invalid);
+ 
+-- 
+2.17.1
+
diff --git a/debian/patches/add-snap-support.patch b/snap-patch/networkmanager/0004-Add-snap-support.patch
similarity index 60%
rename from debian/patches/add-snap-support.patch
rename to snap-patch/networkmanager/0004-Add-snap-support.patch
index a661864..a330150 100644
--- a/debian/patches/add-snap-support.patch
+++ b/snap-patch/networkmanager/0004-Add-snap-support.patch
@@ -1,150 +1,46 @@
-Index: nm/src/nm-core-utils.c
-===================================================================
---- nm.orig/src/nm-core-utils.c
-+++ nm/src/nm-core-utils.c
-@@ -44,6 +44,7 @@
- #include "nm-setting-ip6-config.h"
- #include "nm-setting-wireless.h"
- #include "nm-setting-wireless-security.h"
-+#include "nm-core-utils.h"
- 
- /*
-  * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
-@@ -2978,14 +2979,17 @@ guint8 *
- nm_utils_secret_key_read (gsize *out_key_len, GError **error)
- {
- 	guint8 *secret_key = NULL;
-+	char *secret_key_path = NULL;
- 	gsize key_len;
- 
- 	/* out_key_len is not optional, because without it you cannot safely
- 	 * access the returned memory. */
- 	*out_key_len = 0;
- 
-+	secret_key_path = g_strdup_printf("%s/secret_key", nm_utils_get_state_dir());
-+
- 	/* Let's try to load a saved secret key first. */
--	if (g_file_get_contents (NMSTATEDIR "/secret_key", (char **) &secret_key, &key_len, NULL)) {
-+	if (g_file_get_contents (secret_key_path, (char **) &secret_key, &key_len, NULL)) {
- 		if (key_len < 16) {
- 			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
- 			                     "Key is too short to be usable");
-@@ -3007,14 +3011,16 @@ nm_utils_secret_key_read (gsize *out_key
- 		}
- 
- 		key_mask = umask (0077);
--		if (!g_file_set_contents (NMSTATEDIR "/secret_key", (char *) secret_key, key_len, error)) {
--			g_prefix_error (error, "Can't write " NMSTATEDIR "/secret_key: ");
-+
-+		if (!g_file_set_contents (secret_key_path, (char *) secret_key, key_len, error)) {
-+			g_prefix_error (error, "Can't write %s/secret_key: ", secret_key_path);
- 			key_len = 0;
- 		}
- 		umask (key_mask);
- 	}
- 
- out:
-+	g_free (secret_key_path);
- 	if (key_len) {
- 		*out_key_len = key_len;
- 		return secret_key;
-@@ -3853,6 +3859,74 @@ nm_utils_ip4_address_is_link_local (in_a
- }
- 
- /*****************************************************************************/
-+
-+const char*
-+nm_utils_get_state_dir(void)
-+{
-+	static const char *state_dir = NULL;
-+
-+	if (!state_dir)
-+		state_dir = g_strdup_printf("%s/state", getenv("SNAP_DATA"));
-+
-+	return state_dir;
-+}
-+
-+const char*
-+nm_utils_get_run_dir(void)
-+{
-+	static const char *run_dir = NULL;
-+
-+	if (!run_dir)
-+		run_dir = g_strdup_printf("%s/run", getenv("SNAP_DATA"));
-+
-+	return run_dir;
-+}
-+
-+const char*
-+nm_utils_get_plugin_dir(void)
-+{
-+	static const char *plugin_dir = NULL;
-+
-+	if (!plugin_dir)
-+		plugin_dir = g_strdup_printf("%s/%s", getenv("SNAP"), NMPLUGINDIR);
-+
-+	return plugin_dir;
-+}
-+
-+const char*
-+nm_utils_get_conf_dir(void)
-+{
-+	static const char *conf_dir = NULL;
-+
-+	if (!conf_dir)
-+		conf_dir = g_strdup_printf("%s/conf", getenv("SNAP_DATA"));
-+
-+	return conf_dir;
-+}
-+
-+const char*
-+nm_utils_get_pppd_plugin_dir (void)
-+{
-+	static const char *pppd_plugin_dir = NULL;
-+
-+	if (!pppd_plugin_dir)
-+		pppd_plugin_dir = g_strdup_printf("%s%s", getenv("SNAP"), PPPD_PLUGIN_DIR);
-+
-+	return pppd_plugin_dir;
-+}
-+
-+const char*
-+nm_utils_get_conf_device_state_dir (void)
-+{
-+	static const char *conf_device_state_dir = NULL;
-+
-+	if (!conf_device_state_dir)
-+		conf_device_state_dir = g_strdup_printf("%s/devices", nm_utils_get_run_dir());
-+
-+	return conf_device_state_dir;
-+}
-+
-+/*****************************************************************************/
- 
- /**
-  * Takes a pair @timestamp and @duration, and returns the remaining duration based
-Index: nm/src/nm-core-utils.h
-===================================================================
---- nm.orig/src/nm-core-utils.h
-+++ nm/src/nm-core-utils.h
-@@ -419,6 +419,13 @@ gboolean nm_utils_lifetime_get (guint32
- 
- gboolean nm_utils_ip4_address_is_link_local (in_addr_t addr);
- 
-+const char* nm_utils_get_state_dir (void);
-+const char* nm_utils_get_run_dir (void);
-+const char* nm_utils_get_plugin_dir (void);
-+const char* nm_utils_get_conf_dir (void);
-+const char* nm_utils_get_pppd_plugin_dir (void);
-+const char* nm_utils_get_conf_device_state_dir (void);
-+
- const char *nm_utils_dnsmasq_status_to_string (int status, char *dest, gsize size);
- 
- void nm_utils_get_reverse_dns_domains_ip4 (guint32 ip, guint8 plen, GPtrArray *domains);
-Index: nm/src/devices/nm-device-factory.c
-===================================================================
---- nm.orig/src/devices/nm-device-factory.c
-+++ nm/src/devices/nm-device-factory.c
+From 6e74f89b21cc736e64ef82d3676d7d5bd4562363 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
+ <[e-mail]>
+Date: Thu, 30 Jan 2020 13:28:11 +0100
+Subject: [PATCH 4/6] Add snap support
+
+---
+ Makefile.am                                   |  1 +
+ src/devices/nm-device-factory.c               |  3 +-
+ src/dhcp/nm-dhcp-dhclient.c                   |  7 +-
+ src/dhcp/nm-dhcp-systemd.c                    |  3 +-
+ src/dns/nm-dns-dnsmasq.c                      | 27 +++++--
+ src/dns/nm-dns-manager.c                      | 51 ++++++------
+ src/dnsmasq/nm-dnsmasq-manager.c              | 16 ++--
+ src/main-utils.c                              | 18 ++---
+ src/main.c                                    |  7 +-
+ src/nm-config.c                               | 33 +++++---
+ src/nm-config.h                               |  2 -
+ src/nm-core-utils.c                           | 80 ++++++++++++++++++-
+ src/nm-core-utils.h                           |  7 ++
+ src/nm-iface-helper.c                         |  4 +-
+ src/ppp/nm-ppp-manager.c                      |  9 ++-
+ src/settings/nm-settings-connection.c         | 48 +++++++----
+ src/settings/nm-settings.c                    |  3 +-
+ .../plugins/keyfile/nms-keyfile-utils.c       |  5 +-
+ 18 files changed, 236 insertions(+), 88 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 18bc1d1e8..3c54ed560 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1135,6 +1135,7 @@ src_cppflags = \
+ 	-DNMRUNDIR=\"$(nmrundir)\" \
+ 	-DNMSTATEDIR=\"$(nmstatedir)\" \
+ 	-DNMLIBDIR=\"$(nmlibdir)\" \
++	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
+ 	\
+ 	-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
+ 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
+index 97f011c5e..94e53ad7d 100644
+--- a/src/devices/nm-device-factory.c
++++ b/src/devices/nm-device-factory.c
 @@ -32,6 +32,7 @@
  #include "nm-utils.h"
  #include "nm-core-internal.h"
@@ -153,7 +49,7 @@ Index: nm/src/devices/nm-device-factory.c
  
  #define PLUGIN_PREFIX "libnm-device-plugin-"
  
-@@ -375,7 +376,7 @@ nm_device_factory_manager_load_factories
+@@ -375,7 +376,7 @@ nm_device_factory_manager_load_factories (NMDeviceFactoryManagerFactoryFunc call
  	_ADD_INTERNAL (nm_vlan_device_factory_get_type);
  	_ADD_INTERNAL (nm_vxlan_device_factory_get_type);
  
@@ -162,10 +58,10 @@ Index: nm/src/devices/nm-device-factory.c
  	if (!paths)
  		return;
  
-Index: nm/src/dhcp/nm-dhcp-dhclient.c
-===================================================================
---- nm.orig/src/dhcp/nm-dhcp-dhclient.c
-+++ nm/src/dhcp/nm-dhcp-dhclient.c
+diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
+index 74d920a8d..ff3d0ed38 100644
+--- a/src/dhcp/nm-dhcp-dhclient.c
++++ b/src/dhcp/nm-dhcp-dhclient.c
 @@ -46,6 +46,7 @@
  #include "NetworkManagerUtils.h"
  #include "nm-dhcp-listener.h"
@@ -184,7 +80,7 @@ Index: nm/src/dhcp/nm-dhcp-dhclient.c
  	                        _addr_family_to_path_part (addr_family),
  	                        uuid,
  	                        iface);
-@@ -313,7 +315,8 @@ create_dhclient_config (NMDhcpDhclient *
+@@ -313,7 +315,8 @@ create_dhclient_config (NMDhcpDhclient *self,
  
  	g_return_val_if_fail (iface != NULL, NULL);
  
@@ -194,11 +90,11 @@ Index: nm/src/dhcp/nm-dhcp-dhclient.c
  	_LOGD ("creating composite dhclient config %s", new);
  
  	orig = find_existing_config (self, addr_family, iface, uuid);
-Index: nm/src/dhcp/nm-dhcp-systemd.c
-===================================================================
---- nm.orig/src/dhcp/nm-dhcp-systemd.c
-+++ nm/src/dhcp/nm-dhcp-systemd.c
-@@ -445,7 +445,8 @@ lease_to_ip4_config (NMDedupMultiIndex *
+diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
+index f79b7cb1e..983c80915 100644
+--- a/src/dhcp/nm-dhcp-systemd.c
++++ b/src/dhcp/nm-dhcp-systemd.c
+@@ -445,7 +445,8 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx,
  static char *
  get_leasefile_path (int addr_family, const char *iface, const char *uuid)
  {
@@ -208,566 +104,492 @@ Index: nm/src/dhcp/nm-dhcp-systemd.c
  	                        addr_family == AF_INET6 ? "6" : "",
  	                        uuid,
  	                        iface);
-Index: nm/src/main-utils.c
-===================================================================
---- nm.orig/src/main-utils.c
-+++ nm/src/main-utils.c
-@@ -34,6 +34,7 @@
- 
- #include "main-utils.h"
+diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
+index 8c85cc235..360bacd8a 100644
+--- a/src/dns/nm-dns-dnsmasq.c
++++ b/src/dns/nm-dns-dnsmasq.c
+@@ -38,9 +38,6 @@
+ #include "nm-bus-manager.h"
  #include "NetworkManagerUtils.h"
-+#include "nm-core-utils.h"
- #include "nm-config.h"
  
- static gboolean
-@@ -118,7 +119,7 @@ nm_main_utils_ensure_statedir ()
- 	gs_free char *parent = NULL;
- 	int errsv;
+-#define PIDFILE NMRUNDIR "/dnsmasq.pid"
+-#define CONFDIR NMCONFDIR "/dnsmasq.d"
+-
+ #define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
+ #define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
  
--	parent = g_path_get_dirname (NMSTATEDIR);
-+	parent = g_path_get_dirname (nm_utils_get_state_dir());
+@@ -310,6 +307,10 @@ start_dnsmasq (NMDnsDnsmasq *self)
+ 	guint idx = 0;
+ 	NMBusManager *dbus_mgr;
+ 	GDBusConnection *connection;
++	char *pidfile = NULL;
++	char *pidfile_arg = NULL;
++	char *confdir = NULL;
++	char *confdir_arg = NULL;
  
- 	/* Ensure parent state directories exists */
- 	if (   parent
-@@ -126,13 +127,13 @@ nm_main_utils_ensure_statedir ()
- 	    && parent[1] != '\0'
- 	    && g_mkdir_with_parents (parent, 0755) != 0) {
- 		errsv = errno;
--		fprintf (stderr, "Cannot create parents for '%s': %s", NMSTATEDIR, g_strerror (errsv));
-+		fprintf (stderr, "Cannot create parents for '%s': %s", nm_utils_get_state_dir(), g_strerror (errsv));
- 		exit (1);
- 	}
- 	/* Ensure state directory exists */
--	if (g_mkdir_with_parents (NMSTATEDIR, 0700) != 0) {
-+	if (g_mkdir_with_parents (nm_utils_get_state_dir(), 0700) != 0) {
- 		errsv = errno;
--		fprintf (stderr, "Cannot create '%s': %s", NMSTATEDIR, g_strerror (errsv));
-+		fprintf (stderr, "Cannot create '%s': %s", nm_utils_get_state_dir(), g_strerror (errsv));
- 		exit (1);
+ 	if (priv->running) {
+ 		/* the dnsmasq process is running. Nothing to do. */
+@@ -328,12 +329,15 @@ start_dnsmasq (NMDnsDnsmasq *self)
+ 		return;
  	}
- }
-@@ -143,20 +144,19 @@ nm_main_utils_ensure_rundir ()
- 	int errsv;
  
- 	/* Setup runtime directory */
--	if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) {
-+	if (g_mkdir_with_parents (nm_utils_get_run_dir(), 0755) != 0) {
- 		errsv = errno;
--		fprintf (stderr, _("Cannot create '%s': %s"), NMRUNDIR, g_strerror (errsv));
-+		fprintf (stderr, _("Cannot create '%s': %s"), nm_utils_get_run_dir(), g_strerror (errsv));
- 		exit (1);
- 	}
++	pidfile = g_strdup_printf ("%s/dnsmasq.pid", nm_utils_get_run_dir ());
++	pidfile_arg = g_strdup_printf ("--pid-file=%s", pidfile);
++
+ 	argv[idx++] = dm_binary;
+ 	argv[idx++] = "--no-resolv";  /* Use only commandline */
+ 	argv[idx++] = "--keep-in-foreground";
+ 	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
+ 	argv[idx++] = "--bind-interfaces";
+-	argv[idx++] = "--pid-file=" PIDFILE;
++	argv[idx++] = pidfile_arg;
+ 	argv[idx++] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */
+ 	argv[idx++] = "--cache-size=0";
+ 	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
+@@ -341,15 +345,24 @@ start_dnsmasq (NMDnsDnsmasq *self)
+ 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+ 	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
  
- 	/* NM_CONFIG_DEVICE_STATE_DIR is used to determine whether NM is restarted or not.
- 	 * It is important to set NMConfigCmdLineOptions.first_start before creating
- 	 * the directory. */
--	nm_assert (g_str_has_prefix (NM_CONFIG_DEVICE_STATE_DIR, NMRUNDIR"/"));
--	if (g_mkdir (NM_CONFIG_DEVICE_STATE_DIR, 0755) != 0) {
-+	if (g_mkdir (nm_utils_get_conf_device_state_dir(), 0755) != 0) {
- 		errsv = errno;
- 		if (errsv != EEXIST) {
--			fprintf (stderr, _("Cannot create '%s': %s"), NM_CONFIG_DEVICE_STATE_DIR, g_strerror (errsv));
-+			fprintf (stderr, _("Cannot create '%s': %s"), nm_utils_get_conf_device_state_dir(), g_strerror (errsv));
- 			exit (1);
- 		}
- 	}
-Index: nm/src/main.c
-===================================================================
---- nm.orig/src/main.c
-+++ nm/src/main.c
-@@ -53,12 +53,15 @@
- #include "dns/nm-dns-manager.h"
- #include "systemd/nm-sd.h"
- #include "nm-netns.h"
-+#include "nm-core-utils.h"
++	confdir = g_strdup_printf ("%s/dnsmasq.d", nm_utils_get_conf_dir ());
++	confdir_arg = g_strdup_printf ("--pid-file=%s", confdir);
++
+ 	/* dnsmasq exits if the conf dir is not present */
+-	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+-		argv[idx++] = "--conf-dir=" CONFDIR;
++	if (g_file_test (confdir, G_FILE_TEST_IS_DIR))
++		argv[idx++] = confdir_arg;
  
- #if !defined(NM_DIST_VERSION)
- # define NM_DIST_VERSION VERSION
- #endif
+ 	argv[idx++] = NULL;
+ 	nm_assert (idx <= G_N_ELEMENTS (argv));
  
- #define NM_DEFAULT_PID_FILE          NMRUNDIR "/NetworkManager.pid"
+ 	/* And finally spawn dnsmasq */
+-	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
++	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, pidfile, "bin/dnsmasq");
 +
-+/* TODO[snap]: this doesn't appear to be used anywhere else? */
- #define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state"
++	g_free (pidfile);
++	g_free (pidfile_arg);
++	g_free (confdir);
++	g_free (confdir_arg);
++
+ 	if (!pid)
+ 		return;
  
- #define CONFIG_ATOMIC_SECTION_PREFIXES ((char **) NULL)
-@@ -212,7 +215,7 @@ do_early_setup (int *argc, char **argv[]
- 	                                _("NetworkManager monitors all network connections and automatically\nchooses the best connection to use.  It also allows the user to\nspecify wireless access points which wireless cards in the computer\nshould associate with.")))
- 		exit (1);
- 
--	global_opt.pidfile = global_opt.pidfile ? global_opt.pidfile : g_strdup (NM_DEFAULT_PID_FILE);
-+	global_opt.pidfile = global_opt.pidfile ? global_opt.pidfile : g_strdup_printf ("%s/NetworkManager.pid", nm_utils_get_run_dir());
+diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
+index 6b397a050..180fa1a6f 100644
+--- a/src/dns/nm-dns-manager.c
++++ b/src/dns/nm-dns-manager.c
+@@ -752,8 +752,6 @@ _read_link_cached (const char *path, gboolean *is_cached, char **cached)
+ 	return (*cached = g_file_read_link (path, NULL));
  }
  
- /*
-@@ -244,7 +247,7 @@ main (int argc, char *argv[])
- 
- 	/* we determine a first-start (contrary to a restart during the same boot)
- 	 * based on the existence of NM_CONFIG_DEVICE_STATE_DIR directory. */
--	config_cli = nm_config_cmd_line_options_new (!g_file_test (NM_CONFIG_DEVICE_STATE_DIR,
-+	config_cli = nm_config_cmd_line_options_new (!g_file_test (nm_utils_get_conf_device_state_dir(),
- 	                                                           G_FILE_TEST_IS_DIR));
- 
- 	do_early_setup (&argc, &argv, config_cli);
-Index: nm/src/nm-config.c
-===================================================================
---- nm.orig/src/nm-config.c
-+++ nm/src/nm-config.c
-@@ -167,6 +167,16 @@ static void _set_config_data (NMConfig *
- 
- /*****************************************************************************/
+-#define MY_RESOLV_CONF NMRUNDIR "/resolv.conf"
+-#define MY_RESOLV_CONF_TMP MY_RESOLV_CONF ".tmp"
+ #define RESOLV_CONF_TMP "/etc/.resolv.conf.NetworkManager"
  
-+static const char *get_no_auto_default_file_path()
-+{
-+	const char *no_auto_default_file = NULL;
-+
-+	if (!no_auto_default_file)
-+		no_auto_default_file = g_strdup_printf("%s/no-auto-default.state", nm_utils_get_state_dir());
-+
-+	return no_auto_default_file;
-+}
+ static SpawnResult
+@@ -773,6 +771,11 @@ update_resolv_conf (NMDnsManager *self,
+ 	nm_auto_free char *rc_path_real = NULL;
+ 	gboolean resconf_link_cached = FALSE;
+ 	gs_free char *resconf_link = NULL;
++	gs_free char *my_resolv_conf = NULL;
++	gs_free char *my_resolv_conf_tmp = NULL;
 +
- gint
- nm_config_parse_boolean (const char *str,
-                          gint default_value)
-@@ -2052,13 +2062,14 @@ NMConfigDeviceStateData *
- nm_config_device_state_load (int ifindex)
- {
- 	NMConfigDeviceStateData *device_state;
--	char path[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR) + 60];
-+	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ());
-+	char path[dev_state_dir_len + 60];
- 	gs_unref_keyfile GKeyFile *kf = NULL;
- 	const char *nm_owned_str;
++	my_resolv_conf = g_strdup_printf ("%s/resolv.conf", nm_utils_get_run_dir ());
++	my_resolv_conf_tmp = g_strdup_printf ("%s.tmp", my_resolv_conf);
  
- 	g_return_val_if_fail (ifindex > 0, NULL);
+ 	/* If we are not managing /etc/resolv.conf and it points to
+ 	 * MY_RESOLV_CONF, don't write the private DNS configuration to
+@@ -783,9 +786,9 @@ update_resolv_conf (NMDnsManager *self,
+ 	 * internal resolv.conf file. */
+ 	if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED) {
+ 		if (nm_streq0 (_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link),
+-		               MY_RESOLV_CONF)) {
+-			_LOGD ("update-resolv-conf: not updating " _PATH_RESCONF
+-			       " since it points to " MY_RESOLV_CONF);
++		               my_resolv_conf)) {
++			_LOGD ("update-resolv-conf: not updating %s since it points to %s",
++				   _PATH_RESCONF, my_resolv_conf);
+ 			return SR_SUCCESS;
+ 		}
+ 	}
+@@ -818,16 +821,16 @@ update_resolv_conf (NMDnsManager *self,
+ 		}
+ 	}
  
--	nm_sprintf_buf (path, "%s/%d", NM_CONFIG_DEVICE_STATE_DIR, ifindex);
-+	nm_sprintf_buf (path, "%s/%d", nm_utils_get_conf_device_state_dir(), ifindex);
+-	if ((f = fopen (MY_RESOLV_CONF_TMP, "we")) == NULL) {
++	if ((f = fopen (my_resolv_conf_tmp, "we")) == NULL) {
+ 		errsv = errno;
+ 		g_set_error (error,
+ 		             NM_MANAGER_ERROR,
+ 		             NM_MANAGER_ERROR_FAILED,
+ 		             "Could not open %s: %s",
+-		             MY_RESOLV_CONF_TMP,
++		             my_resolv_conf_tmp,
+ 		             g_strerror (errsv));
+ 		_LOGT ("update-resolv-conf: open temporary file %s failed (%s)",
+-		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
++		       my_resolv_conf_tmp, g_strerror (errsv));
+ 		return SR_ERROR;
+ 	}
  
- 	kf = nm_config_create_keyfile ();
- 	if (!g_key_file_load_from_file (kf, path, G_KEY_FILE_NONE, NULL))
-@@ -2102,7 +2113,7 @@ nm_config_device_state_load_all (void)
+@@ -835,7 +838,7 @@ update_resolv_conf (NMDnsManager *self,
+ 	if (!success) {
+ 		errsv = errno;
+ 		_LOGT ("update-resolv-conf: write temporary file %s failed (%s)",
+-		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
++		       my_resolv_conf_tmp, g_strerror (errsv));
+ 	}
  
- 	states = g_hash_table_new_full (nm_direct_hash, NULL, NULL, g_free);
+ 	if (fclose (f) < 0) {
+@@ -848,25 +851,25 @@ update_resolv_conf (NMDnsManager *self,
+ 			             NM_MANAGER_ERROR,
+ 			             NM_MANAGER_ERROR_FAILED,
+ 			             "Could not close %s: %s",
+-			             MY_RESOLV_CONF_TMP,
++			             my_resolv_conf_tmp,
+ 			             g_strerror (errsv));
+ 			_LOGT ("update-resolv-conf: close temporary file %s failed (%s)",
+-			       MY_RESOLV_CONF_TMP, g_strerror (errsv));
++			       my_resolv_conf_tmp, g_strerror (errsv));
+ 		}
+ 		return SR_ERROR;
+ 	} else if (!success)
+ 		return SR_ERROR;
  
--	dir = g_dir_open (NM_CONFIG_DEVICE_STATE_DIR, 0, NULL);
-+	dir = g_dir_open (nm_utils_get_conf_device_state_dir(), 0, NULL);
- 	if (!dir)
- 		return states;
+-	if (rename (MY_RESOLV_CONF_TMP, MY_RESOLV_CONF) < 0) {
++	if (rename (my_resolv_conf_tmp, my_resolv_conf) < 0) {
+ 		errsv = errno;
+ 		g_set_error (error,
+ 		             NM_MANAGER_ERROR,
+ 		             NM_MANAGER_ERROR_FAILED,
+ 		             "Could not replace %s: %s",
+-		             MY_RESOLV_CONF,
++		             my_resolv_conf,
+ 		             g_strerror (errno));
+ 		_LOGT ("update-resolv-conf: failed to rename temporary file %s to %s (%s)",
+-		       MY_RESOLV_CONF_TMP, MY_RESOLV_CONF, g_strerror (errsv));
++		       my_resolv_conf_tmp, my_resolv_conf, g_strerror (errsv));
+ 		return SR_ERROR;
+ 	}
  
-@@ -2134,7 +2145,8 @@ nm_config_device_state_write (int ifinde
-                               guint32 route_metric_default_aspired,
-                               guint32 route_metric_default_effective)
- {
--	char path[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR) + 60];
-+	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ());
-+	char path[dev_state_dir_len + 60];
- 	GError *local = NULL;
- 	gs_unref_keyfile GKeyFile *kf = NULL;
+@@ -878,14 +881,14 @@ update_resolv_conf (NMDnsManager *self,
  
-@@ -2144,7 +2156,7 @@ nm_config_device_state_write (int ifinde
+ 	if (   rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
+ 	    || !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link)) {
+-		_LOGT ("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF);
++		_LOGT ("update-resolv-conf: write internal file %s succeeded", my_resolv_conf);
+ 		return SR_SUCCESS;
+ 	}
  
- 	nm_assert (!perm_hw_addr_fake || nm_utils_hwaddr_valid (perm_hw_addr_fake, -1));
+ 	if (!nm_streq0 (_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link),
+-	                MY_RESOLV_CONF)) {
++	                my_resolv_conf)) {
+ 		_LOGT ("update-resolv-conf: write internal file %s succeeded (don't touch symlink %s linking to %s)",
+-		       MY_RESOLV_CONF, _PATH_RESCONF,
++		       my_resolv_conf, _PATH_RESCONF,
+ 		       _read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link));
+ 		return SR_SUCCESS;
+ 	}
+@@ -904,22 +907,22 @@ update_resolv_conf (NMDnsManager *self,
+ 		             g_strerror (errsv));
+ 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
+ 		       "but canot delete temporary file %s: %s",
+-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
++		       my_resolv_conf, RESOLV_CONF_TMP, g_strerror (errsv));
+ 		return SR_ERROR;
+ 	}
  
--	nm_sprintf_buf (path, "%s/%d", NM_CONFIG_DEVICE_STATE_DIR, ifindex);
-+	nm_sprintf_buf (path, "%s/%d", nm_utils_get_conf_device_state_dir(), ifindex);
+-	if (symlink (MY_RESOLV_CONF, RESOLV_CONF_TMP) == -1) {
++	if (symlink (my_resolv_conf, RESOLV_CONF_TMP) == -1) {
+ 		errsv = errno;
+ 		g_set_error (error,
+ 		             NM_MANAGER_ERROR,
+ 		             NM_MANAGER_ERROR_FAILED,
+ 		             "Could not create symlink %s pointing to %s: %s",
+ 		             RESOLV_CONF_TMP,
+-		             MY_RESOLV_CONF,
++		             my_resolv_conf,
+ 		             g_strerror (errsv));
+ 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
+ 		       "but failed to symlink %s: %s",
+-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
++		       my_resolv_conf, RESOLV_CONF_TMP, g_strerror (errsv));
+ 		return SR_ERROR;
+ 	}
  
- 	kf = nm_config_create_keyfile ();
- 	if (NM_IN_SET (managed,
-@@ -2209,12 +2221,15 @@ nm_config_device_state_prune_unseen (GHa
- 	const char *fn;
- 	int ifindex;
- 	gsize fn_len;
--	char buf[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR"/") + 30 + 3] = NM_CONFIG_DEVICE_STATE_DIR"/";
--	char *buf_p = &buf[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR"/")];
-+	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ()) + 1;
-+	char buf[dev_state_dir_len + 30 + 3];
-+	char *buf_p = &buf[dev_state_dir_len];
-+
-+	g_snprintf(buf, dev_state_dir_len, "%s/", nm_utils_get_conf_device_state_dir ());
+@@ -934,12 +937,12 @@ update_resolv_conf (NMDnsManager *self,
+ 		             g_strerror (errsv));
+ 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
+ 		       "but failed to rename temporary symlink %s to %s: %s",
+-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, _PATH_RESCONF, g_strerror (errsv));
++		       my_resolv_conf, RESOLV_CONF_TMP, _PATH_RESCONF, g_strerror (errsv));
+ 		return SR_ERROR;
+ 	}
  
- 	g_return_if_fail (seen_ifindexes);
+ 	_LOGT ("update-resolv-conf: write internal file %s succeeded and update symlink %s",
+-	       MY_RESOLV_CONF, _PATH_RESCONF);
++	       my_resolv_conf, _PATH_RESCONF);
+ 	return SR_SUCCESS;
+ }
  
--	dir = g_dir_open (NM_CONFIG_DEVICE_STATE_DIR, 0, NULL);
-+	dir = g_dir_open (nm_utils_get_conf_device_state_dir (), 0, NULL);
- 	if (!dir)
- 		return;
+@@ -1963,6 +1966,8 @@ again:
+ 			_clear_plugin (self);
+ 			priv->plugin = nm_dns_systemd_resolved_new ();
+ 			plugin_changed = TRUE;
++
++			_LOGI ("init: plugin_changed: systemd-resolvd");
+ 		}
+ 		mode = "systemd-resolved";
+ 	} else if (nm_streq0 (mode, "dnsmasq")) {
+diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
+index 323ef7819..3225314b3 100644
+--- a/src/dnsmasq/nm-dnsmasq-manager.c
++++ b/src/dnsmasq/nm-dnsmasq-manager.c
+@@ -35,8 +35,6 @@
+ #include "NetworkManagerUtils.h"
+ #include "nm-core-internal.h"
  
-@@ -2525,7 +2540,7 @@ init_sync (GInitable *initable, GCancell
- 	if (priv->cli.no_auto_default_file)
- 		priv->no_auto_default_file = g_strdup (priv->cli.no_auto_default_file);
- 	else
--		priv->no_auto_default_file = g_strdup (DEFAULT_NO_AUTO_DEFAULT_FILE);
-+		priv->no_auto_default_file = g_strdup (get_no_auto_default_file_path());
+-#define CONFDIR NMCONFDIR "/dnsmasq-shared.d"
+-
+ /*****************************************************************************/
  
- 	priv->monitor_connection_files = nm_config_keyfile_get_boolean (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "monitor-connection-files", FALSE);
+ enum {
+@@ -161,6 +159,8 @@ create_dm_cmd_line (const char *iface,
+ 	const char *dm_binary;
+ 	const NMPlatformIP4Address *listen_address;
+ 	guint i, n;
++	char *confdir = NULL;
++	char *confdir_arg = NULL;
  
-Index: nm/src/ppp/nm-ppp-manager.c
-===================================================================
---- nm.orig/src/ppp/nm-ppp-manager.c
-+++ nm/src/ppp/nm-ppp-manager.c
-@@ -57,7 +57,7 @@
+ 	listen_address = nm_ip4_config_get_first_address (ip4_config);
+ 	g_return_val_if_fail (listen_address, NULL);
+@@ -254,10 +254,16 @@ create_dm_cmd_line (const char *iface,
+ 	nm_cmd_line_add_string (cmd, s->str);
+ 	g_string_truncate (s, 0);
  
- #include "introspection/org.freedesktop.NetworkManager.PPP.h"
++	confdir = g_strdup_printf("%s/dnsmasq-shared.d", nm_utils_get_conf_dir());
++
+ 	/* dnsmasq exits if the conf dir is not present */
+-	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+-		nm_cmd_line_add_string (cmd, "--conf-dir=" CONFDIR);
++	if (g_file_test (confdir, G_FILE_TEST_IS_DIR)) {
++		confdir_arg = g_strdup_printf("--conf-dir=%s", confdir);
++		nm_cmd_line_add_string (cmd, confdir_arg);
++	}
  
--#define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so"
-+#define NM_PPPD_PLUGIN "nm-pppd-plugin.so"
++	g_free (confdir);
++	g_free (confdir_arg);
+ 	return cmd;
+ }
  
- static NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark)
+@@ -381,7 +387,7 @@ nm_dnsmasq_manager_new (const char *iface)
  
-@@ -739,6 +739,7 @@ create_pppd_cmd_line (NMPPPManager *self
- 	const char *pppd_binary = NULL;
- 	NMCmdLine *cmd;
- 	gboolean ppp_debug;
-+	char *pppd_plugin_dir;
- 	static int unit;
+ 	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);
  
- 	g_return_val_if_fail (setting != NULL, NULL);
-@@ -901,8 +902,12 @@ create_pppd_cmd_line (NMPPPManager *self
- 	nm_cmd_line_add_string (cmd, "ipparam");
- 	nm_cmd_line_add_string (cmd, nm_exported_object_get_path (NM_EXPORTED_OBJECT (self)));
+ 	return manager;
+ }
+diff --git a/src/main-utils.c b/src/main-utils.c
+index 0f7905360..93329eef1 100644
+--- a/src/main-utils.c
++++ b/src/main-utils.c
+@@ -34,6 +34,7 @@
  
-+	pppd_plugin_dir = g_strdup_printf ("%s/%s", nm_utils_get_pppd_plugin_dir (), NM_PPPD_PLUGIN);
-+
- 	nm_cmd_line_add_string (cmd, "plugin");
--	nm_cmd_line_add_string (cmd, NM_PPPD_PLUGIN);
-+	nm_cmd_line_add_string (cmd, pppd_plugin_dir);
-+
-+	g_free (pppd_plugin_dir);
+ #include "main-utils.h"
+ #include "NetworkManagerUtils.h"
++#include "nm-core-utils.h"
+ #include "nm-config.h"
  
- 	if (pppoe && nm_setting_pppoe_get_parent (pppoe)) {
- 		/* The PPP interface is going to be renamed, so pass a
-Index: nm/src/nm-iface-helper.c
-===================================================================
---- nm.orig/src/nm-iface-helper.c
-+++ nm/src/nm-iface-helper.c
-@@ -48,8 +48,6 @@
+ static gboolean
+@@ -118,7 +119,7 @@ nm_main_utils_ensure_statedir ()
+ 	gs_free char *parent = NULL;
+ 	int errsv;
+ 
+-	parent = g_path_get_dirname (NMSTATEDIR);
++	parent = g_path_get_dirname (nm_utils_get_state_dir());
+ 
+ 	/* Ensure parent state directories exists */
+ 	if (   parent
+@@ -126,13 +127,13 @@ nm_main_utils_ensure_statedir ()
+ 	    && parent[1] != '\0'
+ 	    && g_mkdir_with_parents (parent, 0755) != 0) {
+ 		errsv = errno;
+-		fprintf (stderr, "Cannot create parents for '%s': %s", NMSTATEDIR, g_strerror (errsv));
++		fprintf (stderr, "Cannot create parents for '%s': %s", nm_utils_get_state_dir(), g_strerror (errsv));
+ 		exit (1);
+ 	}
+ 	/* Ensure state directory exists */
+-	if (g_mkdir_with_parents (NMSTATEDIR, 0700) != 0) {
++	if (g_mkdir_with_parents (nm_utils_get_state_dir(), 0700) != 0) {
+ 		errsv = errno;
+-		fprintf (stderr, "Cannot create '%s': %s", NMSTATEDIR, g_strerror (errsv));
++		fprintf (stderr, "Cannot create '%s': %s", nm_utils_get_state_dir(), g_strerror (errsv));
+ 		exit (1);
+ 	}
+ }
+@@ -143,20 +144,19 @@ nm_main_utils_ensure_rundir ()
+ 	int errsv;
+ 
+ 	/* Setup runtime directory */
+-	if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) {
++	if (g_mkdir_with_parents (nm_utils_get_run_dir(), 0755) != 0) {
+ 		errsv = errno;
+-		fprintf (stderr, _("Cannot create '%s': %s"), NMRUNDIR, g_strerror (errsv));
++		fprintf (stderr, _("Cannot create '%s': %s"), nm_utils_get_run_dir(), g_strerror (errsv));
+ 		exit (1);
+ 	}
+ 
+ 	/* NM_CONFIG_DEVICE_STATE_DIR is used to determine whether NM is restarted or not.
+ 	 * It is important to set NMConfigCmdLineOptions.first_start before creating
+ 	 * the directory. */
+-	nm_assert (g_str_has_prefix (NM_CONFIG_DEVICE_STATE_DIR, NMRUNDIR"/"));
+-	if (g_mkdir (NM_CONFIG_DEVICE_STATE_DIR, 0755) != 0) {
++	if (g_mkdir (nm_utils_get_conf_device_state_dir(), 0755) != 0) {
+ 		errsv = errno;
+ 		if (errsv != EEXIST) {
+-			fprintf (stderr, _("Cannot create '%s': %s"), NM_CONFIG_DEVICE_STATE_DIR, g_strerror (errsv));
++			fprintf (stderr, _("Cannot create '%s': %s"), nm_utils_get_conf_device_state_dir(), g_strerror (errsv));
+ 			exit (1);
+ 		}
+ 	}
+diff --git a/src/main.c b/src/main.c
+index d59da0522..33e1708b4 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -53,12 +53,15 @@
+ #include "dns/nm-dns-manager.h"
+ #include "systemd/nm-sd.h"
+ #include "nm-netns.h"
++#include "nm-core-utils.h"
+ 
+ #if !defined(NM_DIST_VERSION)
  # define NM_DIST_VERSION VERSION
  #endif
  
--#define NMIH_PID_FILE_FMT NMRUNDIR "/nm-iface-helper-%d.pid"
--
- /*****************************************************************************/
+ #define NM_DEFAULT_PID_FILE          NMRUNDIR "/NetworkManager.pid"
++
++/* TODO[snap]: this doesn't appear to be used anywhere else? */
+ #define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state"
  
- static struct {
-@@ -385,7 +383,7 @@ main (int argc, char *argv[])
- 		fprintf (stderr, _("Failed to find interface index for %s (%s)\n"), global_opt.ifname, strerror (errno));
- 		return 1;
- 	}
--	pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, gl.ifindex);
-+	pidfile = g_strdup_printf ("%s/nm-iface-helper-%d.pid", nm_utils_get_run_dir(), gl.ifindex);
- 	nm_main_utils_ensure_not_running_pidfile (pidfile);
+ #define CONFIG_ATOMIC_SECTION_PREFIXES ((char **) NULL)
+@@ -212,7 +215,7 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli)
+ 	                                _("NetworkManager monitors all network connections and automatically\nchooses the best connection to use.  It also allows the user to\nspecify wireless access points which wireless cards in the computer\nshould associate with.")))
+ 		exit (1);
  
- 	nm_main_utils_ensure_rundir ();
-Index: nm/src/settings/nm-settings-connection.c
-===================================================================
---- nm.orig/src/settings/nm-settings-connection.c
-+++ nm/src/settings/nm-settings-connection.c
-@@ -41,9 +41,6 @@
+-	global_opt.pidfile = global_opt.pidfile ? global_opt.pidfile : g_strdup (NM_DEFAULT_PID_FILE);
++	global_opt.pidfile = global_opt.pidfile ? global_opt.pidfile : g_strdup_printf ("%s/NetworkManager.pid", nm_utils_get_run_dir());
+ }
  
- #include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
+ /*
+@@ -244,7 +247,7 @@ main (int argc, char *argv[])
  
--#define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"
--#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
--
- #define AUTOCONNECT_RETRIES_UNSET        -2
- #define AUTOCONNECT_RETRIES_FOREVER      -1
- #define AUTOCONNECT_RESET_RETRIES_TIMER 300
-@@ -146,6 +143,27 @@ G_DEFINE_TYPE_WITH_CODE (NMSettingsConne
+ 	/* we determine a first-start (contrary to a restart during the same boot)
+ 	 * based on the existence of NM_CONFIG_DEVICE_STATE_DIR directory. */
+-	config_cli = nm_config_cmd_line_options_new (!g_file_test (NM_CONFIG_DEVICE_STATE_DIR,
++	config_cli = nm_config_cmd_line_options_new (!g_file_test (nm_utils_get_conf_device_state_dir(),
+ 	                                                           G_FILE_TEST_IS_DIR));
+ 
+ 	do_early_setup (&argc, &argv, config_cli);
+diff --git a/src/nm-config.c b/src/nm-config.c
+index 29f0d5177..1624453d2 100644
+--- a/src/nm-config.c
++++ b/src/nm-config.c
+@@ -167,6 +167,16 @@ static void _set_config_data (NMConfig *self, NMConfigData *new_data, NMConfigCh
  
  /*****************************************************************************/
  
-+static const char *get_settings_timestamps_path()
++static const char *get_no_auto_default_file_path()
 +{
-+	static const char *timestamps_path = NULL;
-+
-+	if (!timestamps_path)
-+		timestamps_path = g_strdup_printf("%s/timestamps", nm_utils_get_state_dir());
-+
-+	return timestamps_path;
-+}
++	const char *no_auto_default_file = NULL;
 +
-+static const char *get_settings_seen_bssids_path()
-+{
-+	static const char *seen_bssids_path = NULL;
++	if (!no_auto_default_file)
++		no_auto_default_file = g_strdup_printf("%s/no-auto-default.state", nm_utils_get_state_dir());
 +
-+	if (!seen_bssids_path)
-+		seen_bssids_path = g_strdup_printf("%s/seen-bssids", nm_utils_get_state_dir());
-+	return seen_bssids_path;
++	return no_auto_default_file;
 +}
 +
-+/*****************************************************************************/
-+
- static void
- _emit_updated (NMSettingsConnection *self, gboolean by_user)
+ gint
+ nm_config_parse_boolean (const char *str,
+                          gint default_value)
+@@ -2052,13 +2062,14 @@ NMConfigDeviceStateData *
+ nm_config_device_state_load (int ifindex)
  {
-@@ -748,9 +766,9 @@ remove_entry_from_db (NMSettingsConnecti
- 	const char *db_file;
+ 	NMConfigDeviceStateData *device_state;
+-	char path[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR) + 60];
++	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ());
++	char path[dev_state_dir_len + 60];
+ 	gs_unref_keyfile GKeyFile *kf = NULL;
+ 	const char *nm_owned_str;
  
- 	if (strcmp (db_name, "timestamps") == 0)
--		db_file = SETTINGS_TIMESTAMPS_FILE;
-+		db_file = get_settings_timestamps_path();
- 	else if (strcmp (db_name, "seen-bssids") == 0)
--		db_file = SETTINGS_SEEN_BSSIDS_FILE;
-+		db_file = get_settings_seen_bssids_path();
- 	else
- 		return;
+ 	g_return_val_if_fail (ifindex > 0, NULL);
  
-@@ -2432,9 +2450,9 @@ nm_settings_connection_update_timestamp
+-	nm_sprintf_buf (path, "%s/%d", NM_CONFIG_DEVICE_STATE_DIR, ifindex);
++	nm_sprintf_buf (path, "%s/%d", nm_utils_get_conf_device_state_dir(), ifindex);
  
- 	/* Save timestamp to timestamps database file */
- 	timestamps_file = g_key_file_new ();
--	if (!g_key_file_load_from_file (timestamps_file, SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
-+	if (!g_key_file_load_from_file (timestamps_file, get_settings_timestamps_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
- 		if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
--			_LOGW ("error parsing timestamps file '%s': %s", SETTINGS_TIMESTAMPS_FILE, error->message);
-+			_LOGW ("error parsing timestamps file '%s': %s", get_settings_timestamps_path(), error->message);
- 		g_clear_error (&error);
- 	}
+ 	kf = nm_config_create_keyfile ();
+ 	if (!g_key_file_load_from_file (kf, path, G_KEY_FILE_NONE, NULL))
+@@ -2102,7 +2113,7 @@ nm_config_device_state_load_all (void)
  
-@@ -2445,11 +2463,11 @@ nm_settings_connection_update_timestamp
+ 	states = g_hash_table_new_full (nm_direct_hash, NULL, NULL, g_free);
  
- 	data = g_key_file_to_data (timestamps_file, &len, &error);
- 	if (data) {
--		g_file_set_contents (SETTINGS_TIMESTAMPS_FILE, data, len, &error);
-+		g_file_set_contents (get_settings_timestamps_path(), data, len, &error);
- 		g_free (data);
- 	}
- 	if (error) {
--		_LOGW ("error saving timestamp to file '%s': %s", SETTINGS_TIMESTAMPS_FILE, error->message);
-+		_LOGW ("error saving timestamp to file '%s': %s", get_settings_timestamps_path(), error->message);
- 		g_error_free (error);
- 	}
- 	g_key_file_free (timestamps_file);
-@@ -2475,7 +2493,7 @@ nm_settings_connection_read_and_fill_tim
- 	g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self));
+-	dir = g_dir_open (NM_CONFIG_DEVICE_STATE_DIR, 0, NULL);
++	dir = g_dir_open (nm_utils_get_conf_device_state_dir(), 0, NULL);
+ 	if (!dir)
+ 		return states;
  
- 	timestamps_file = g_key_file_new ();
--	if (!g_key_file_load_from_file (timestamps_file, SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
-+	if (!g_key_file_load_from_file (timestamps_file, get_settings_timestamps_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
- 		_LOGD ("failed to read connection timestamp: %s", error->message);
- 		return;
- 	}
-@@ -2585,10 +2603,10 @@ nm_settings_connection_add_seen_bssid (N
- 	/* Save BSSID to seen-bssids file */
- 	seen_bssids_file = g_key_file_new ();
- 	g_key_file_set_list_separator (seen_bssids_file, ',');
--	if (!g_key_file_load_from_file (seen_bssids_file, SETTINGS_SEEN_BSSIDS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
-+	if (!g_key_file_load_from_file (seen_bssids_file, get_settings_seen_bssids_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
- 		if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
- 			_LOGW ("error parsing seen-bssids file '%s': %s",
--			       SETTINGS_SEEN_BSSIDS_FILE, error->message);
-+			       get_settings_seen_bssids_path(), error->message);
- 		}
- 		g_clear_error (&error);
- 	}
-@@ -2599,14 +2617,14 @@ nm_settings_connection_add_seen_bssid (N
+@@ -2134,7 +2145,8 @@ nm_config_device_state_write (int ifindex,
+                               guint32 route_metric_default_aspired,
+                               guint32 route_metric_default_effective)
+ {
+-	char path[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR) + 60];
++	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ());
++	char path[dev_state_dir_len + 60];
+ 	GError *local = NULL;
+ 	gs_unref_keyfile GKeyFile *kf = NULL;
  
- 	data = g_key_file_to_data (seen_bssids_file, &len, &error);
- 	if (data) {
--		g_file_set_contents (SETTINGS_SEEN_BSSIDS_FILE, data, len, &error);
-+		g_file_set_contents (get_settings_seen_bssids_path(), data, len, &error);
- 		g_free (data);
- 	}
- 	g_key_file_free (seen_bssids_file);
+@@ -2144,7 +2156,7 @@ nm_config_device_state_write (int ifindex,
  
- 	if (error) {
- 		_LOGW ("error saving seen-bssids to file '%s': %s",
--		       SETTINGS_SEEN_BSSIDS_FILE, error->message);
-+		       get_settings_seen_bssids_path(), error->message);
- 		g_error_free (error);
- 	}
- }
-@@ -2631,7 +2649,7 @@ nm_settings_connection_read_and_fill_see
- 	/* Get seen BSSIDs from database file */
- 	seen_bssids_file = g_key_file_new ();
- 	g_key_file_set_list_separator (seen_bssids_file, ',');
--	if (g_key_file_load_from_file (seen_bssids_file, SETTINGS_SEEN_BSSIDS_FILE, G_KEY_FILE_KEEP_COMMENTS, NULL)) {
-+	if (g_key_file_load_from_file (seen_bssids_file, get_settings_seen_bssids_path(), G_KEY_FILE_KEEP_COMMENTS, NULL)) {
- 		connection_uuid = nm_settings_connection_get_uuid (self);
- 		tmp_strv = g_key_file_get_string_list (seen_bssids_file, "seen-bssids", connection_uuid, &len, NULL);
- 	}
-Index: nm/Makefile.am
-===================================================================
---- nm.orig/Makefile.am
-+++ nm/Makefile.am
-@@ -1135,6 +1135,7 @@ src_cppflags = \
- 	-DNMRUNDIR=\"$(nmrundir)\" \
- 	-DNMSTATEDIR=\"$(nmstatedir)\" \
- 	-DNMLIBDIR=\"$(nmlibdir)\" \
-+	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
- 	\
- 	-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
- 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-Index: nm/src/settings/nm-settings.c
-===================================================================
---- nm.orig/src/settings/nm-settings.c
-+++ nm/src/settings/nm-settings.c
-@@ -76,6 +76,7 @@
- #include "NetworkManagerUtils.h"
- #include "nm-dispatcher.h"
- #include "nm-hostname-manager.h"
-+#include "nm-core-utils.h"
- 
- #include "introspection/org.freedesktop.NetworkManager.Settings.h"
- 
-@@ -717,7 +718,7 @@ load_plugin:
- 			int errsv;
- 
- 			full_name = g_strdup_printf ("nm-settings-plugin-%s", pname);
--			path = g_module_build_path (NMPLUGINDIR, full_name);
-+			path = g_module_build_path (nm_utils_get_plugin_dir(), full_name);
- 
- 			if (stat (path, &st) != 0) {
- 				errsv = errno;
-Index: nm/src/settings/plugins/keyfile/nms-keyfile-utils.c
-===================================================================
---- nm.orig/src/settings/plugins/keyfile/nms-keyfile-utils.c
-+++ nm/src/settings/plugins/keyfile/nms-keyfile-utils.c
-@@ -30,8 +30,6 @@
- #include "nm-setting-wireless-security.h"
- #include "nm-config.h"
- 
--#define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections"
--
- /*****************************************************************************/
- 
- static const char temp_letters[] =
-@@ -163,7 +161,8 @@ nms_keyfile_utils_get_path (void)
- 		                                 NM_CONFIG_KEYFILE_KEY_KEYFILE_PATH,
- 		                                 NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY);
- 		if (!path)
--			path = g_strdup (""NM_CONFIG_KEYFILE_PATH_DEFAULT"");
-+			path = g_strdup_printf ("%s/system-connections", nm_utils_get_conf_dir());
-+
- 	}
- 	return path;
- }
-Index: nm/src/dns/nm-dns-dnsmasq.c
-===================================================================
---- nm.orig/src/dns/nm-dns-dnsmasq.c
-+++ nm/src/dns/nm-dns-dnsmasq.c
-@@ -38,9 +38,6 @@
- #include "nm-bus-manager.h"
- #include "NetworkManagerUtils.h"
- 
--#define PIDFILE NMRUNDIR "/dnsmasq.pid"
--#define CONFDIR NMCONFDIR "/dnsmasq.d"
--
- #define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
- #define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
- 
-@@ -480,6 +477,10 @@ start_dnsmasq (NMDnsDnsmasq *self)
- 	guint idx = 0;
- 	NMBusManager *dbus_mgr;
- 	GDBusConnection *connection;
-+	char *pidfile = NULL;
-+	char *pidfile_arg = NULL;
-+	char *confdir = NULL;
-+	char *confdir_arg = NULL;
- 
- 	if (priv->running) {
- 		/* the dnsmasq process is running. Nothing to do. */
-@@ -498,12 +499,15 @@ start_dnsmasq (NMDnsDnsmasq *self)
- 		return;
- 	}
+ 	nm_assert (!perm_hw_addr_fake || nm_utils_hwaddr_valid (perm_hw_addr_fake, -1));
  
-+	pidfile = g_strdup_printf ("%s/dnsmasq.pid", nm_utils_get_run_dir ());
-+	pidfile_arg = g_strdup_printf ("--pid-file=%s", pidfile);
-+
- 	argv[idx++] = dm_binary;
- 	argv[idx++] = "--no-resolv";  /* Use only commandline */
- 	argv[idx++] = "--keep-in-foreground";
- 	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
- 	argv[idx++] = "--bind-interfaces";
--	argv[idx++] = "--pid-file=" PIDFILE;
-+	argv[idx++] = pidfile_arg;
- 	argv[idx++] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */
- 	argv[idx++] = "--cache-size=0";
- 	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
-@@ -511,15 +515,24 @@ start_dnsmasq (NMDnsDnsmasq *self)
- 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
- 	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
+-	nm_sprintf_buf (path, "%s/%d", NM_CONFIG_DEVICE_STATE_DIR, ifindex);
++	nm_sprintf_buf (path, "%s/%d", nm_utils_get_conf_device_state_dir(), ifindex);
  
-+	confdir = g_strdup_printf ("%s/dnsmasq.d", nm_utils_get_conf_dir ());
-+	confdir_arg = g_strdup_printf ("--pid-file=%s", confdir);
+ 	kf = nm_config_create_keyfile ();
+ 	if (NM_IN_SET (managed,
+@@ -2209,12 +2221,15 @@ nm_config_device_state_prune_unseen (GHashTable *seen_ifindexes)
+ 	const char *fn;
+ 	int ifindex;
+ 	gsize fn_len;
+-	char buf[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR"/") + 30 + 3] = NM_CONFIG_DEVICE_STATE_DIR"/";
+-	char *buf_p = &buf[NM_STRLEN (NM_CONFIG_DEVICE_STATE_DIR"/")];
++	gsize dev_state_dir_len = strlen (nm_utils_get_conf_device_state_dir ()) + 1;
++	char buf[dev_state_dir_len + 30 + 3];
++	char *buf_p = &buf[dev_state_dir_len];
 +
- 	/* dnsmasq exits if the conf dir is not present */
--	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
--		argv[idx++] = "--conf-dir=" CONFDIR;
-+	if (g_file_test (confdir, G_FILE_TEST_IS_DIR))
-+		argv[idx++] = confdir_arg;
++	g_snprintf(buf, dev_state_dir_len, "%s/", nm_utils_get_conf_device_state_dir ());
  
- 	argv[idx++] = NULL;
- 	nm_assert (idx <= G_N_ELEMENTS (argv));
+ 	g_return_if_fail (seen_ifindexes);
  
- 	/* And finally spawn dnsmasq */
--	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
-+	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, pidfile, "bin/dnsmasq");
-+
-+	g_free (pidfile);
-+	g_free (pidfile_arg);
-+	g_free (confdir);
-+	g_free (confdir_arg);
-+
- 	if (!pid)
+-	dir = g_dir_open (NM_CONFIG_DEVICE_STATE_DIR, 0, NULL);
++	dir = g_dir_open (nm_utils_get_conf_device_state_dir (), 0, NULL);
+ 	if (!dir)
  		return;
  
-Index: nm/src/dnsmasq/nm-dnsmasq-manager.c
-===================================================================
---- nm.orig/src/dnsmasq/nm-dnsmasq-manager.c
-+++ nm/src/dnsmasq/nm-dnsmasq-manager.c
-@@ -35,8 +35,6 @@
- #include "NetworkManagerUtils.h"
- #include "nm-core-internal.h"
- 
--#define CONFDIR NMCONFDIR "/dnsmasq-shared.d"
--
- /*****************************************************************************/
- 
- enum {
-@@ -161,6 +159,8 @@ create_dm_cmd_line (const char *iface,
- 	const char *dm_binary;
- 	const NMPlatformIP4Address *listen_address;
- 	guint i, n;
-+	char *confdir = NULL;
-+	char *confdir_arg = NULL;
- 
- 	listen_address = nm_ip4_config_get_first_address (ip4_config);
- 	g_return_val_if_fail (listen_address, NULL);
-@@ -254,10 +254,16 @@ create_dm_cmd_line (const char *iface,
- 	nm_cmd_line_add_string (cmd, s->str);
- 	g_string_truncate (s, 0);
- 
-+	confdir = g_strdup_printf("%s/dnsmasq-shared.d", nm_utils_get_conf_dir());
-+
- 	/* dnsmasq exits if the conf dir is not present */
--	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
--		nm_cmd_line_add_string (cmd, "--conf-dir=" CONFDIR);
-+	if (g_file_test (confdir, G_FILE_TEST_IS_DIR)) {
-+		confdir_arg = g_strdup_printf("--conf-dir=%s", confdir);
-+		nm_cmd_line_add_string (cmd, confdir_arg);
-+	}
- 
-+	g_free (confdir);
-+	g_free (confdir_arg);
- 	return cmd;
- }
- 
-@@ -381,7 +387,7 @@ nm_dnsmasq_manager_new (const char *ifac
+@@ -2525,7 +2540,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
+ 	if (priv->cli.no_auto_default_file)
+ 		priv->no_auto_default_file = g_strdup (priv->cli.no_auto_default_file);
+ 	else
+-		priv->no_auto_default_file = g_strdup (DEFAULT_NO_AUTO_DEFAULT_FILE);
++		priv->no_auto_default_file = g_strdup (get_no_auto_default_file_path());
  
- 	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);
+ 	priv->monitor_connection_files = nm_config_keyfile_get_boolean (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "monitor-connection-files", FALSE);
  
- 	return manager;
- }
-Index: nm/src/nm-config.h
-===================================================================
---- nm.orig/src/nm-config.h
-+++ nm/src/nm-config.h
+diff --git a/src/nm-config.h b/src/nm-config.h
+index 42ab4682d..317357fa2 100644
+--- a/src/nm-config.h
++++ b/src/nm-config.h
 @@ -197,8 +197,6 @@ extern char *_nm_config_match_env;
  
  /*****************************************************************************/
@@ -777,170 +599,378 @@ Index: nm/src/nm-config.h
  #define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL     (nm_streq (""NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "true"))
  #define NM_CONFIG_DEFAULT_LOGGING_AUDIT_BOOL        (nm_streq (""NM_CONFIG_DEFAULT_LOGGING_AUDIT, "true"))
  
-Index: nm/src/dns/nm-dns-manager.c
-===================================================================
---- nm.orig/src/dns/nm-dns-manager.c
-+++ nm/src/dns/nm-dns-manager.c
-@@ -623,8 +623,6 @@ _read_link_cached (const char *path, gbo
- 	return (*cached = g_file_read_link (path, NULL));
- }
+diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
+index a8c593eca..b33203681 100644
+--- a/src/nm-core-utils.c
++++ b/src/nm-core-utils.c
+@@ -44,6 +44,7 @@
+ #include "nm-setting-ip6-config.h"
+ #include "nm-setting-wireless.h"
+ #include "nm-setting-wireless-security.h"
++#include "nm-core-utils.h"
  
--#define MY_RESOLV_CONF NMRUNDIR "/resolv.conf"
--#define MY_RESOLV_CONF_TMP MY_RESOLV_CONF ".tmp"
- #define RESOLV_CONF_TMP "/etc/.resolv.conf.NetworkManager"
+ /*
+  * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
+@@ -2978,14 +2979,17 @@ guint8 *
+ nm_utils_secret_key_read (gsize *out_key_len, GError **error)
+ {
+ 	guint8 *secret_key = NULL;
++	char *secret_key_path = NULL;
+ 	gsize key_len;
  
- static SpawnResult
-@@ -644,6 +642,11 @@ update_resolv_conf (NMDnsManager *self,
- 	nm_auto_free char *rc_path_real = NULL;
- 	gboolean resconf_link_cached = FALSE;
- 	gs_free char *resconf_link = NULL;
-+	gs_free char *my_resolv_conf = NULL;
-+	gs_free char *my_resolv_conf_tmp = NULL;
-+
-+	my_resolv_conf = g_strdup_printf ("%s/resolv.conf", nm_utils_get_run_dir ());
-+	my_resolv_conf_tmp = g_strdup_printf ("%s.tmp", my_resolv_conf);
+ 	/* out_key_len is not optional, because without it you cannot safely
+ 	 * access the returned memory. */
+ 	*out_key_len = 0;
  
- 	/* If we are not managing /etc/resolv.conf and it points to
- 	 * MY_RESOLV_CONF, don't write the private DNS configuration to
-@@ -654,9 +657,9 @@ update_resolv_conf (NMDnsManager *self,
- 	 * internal resolv.conf file. */
- 	if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED) {
- 		if (nm_streq0 (_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link),
--		               MY_RESOLV_CONF)) {
--			_LOGD ("update-resolv-conf: not updating " _PATH_RESCONF
--			       " since it points to " MY_RESOLV_CONF);
-+		               my_resolv_conf)) {
-+			_LOGD ("update-resolv-conf: not updating %s since it points to %s",
-+				   _PATH_RESCONF, my_resolv_conf);
- 			return SR_SUCCESS;
++	secret_key_path = g_strdup_printf("%s/secret_key", nm_utils_get_state_dir());
++
+ 	/* Let's try to load a saved secret key first. */
+-	if (g_file_get_contents (NMSTATEDIR "/secret_key", (char **) &secret_key, &key_len, NULL)) {
++	if (g_file_get_contents (secret_key_path, (char **) &secret_key, &key_len, NULL)) {
+ 		if (key_len < 16) {
+ 			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+ 			                     "Key is too short to be usable");
+@@ -3007,14 +3011,16 @@ nm_utils_secret_key_read (gsize *out_key_len, GError **error)
  		}
- 	}
-@@ -689,16 +692,16 @@ update_resolv_conf (NMDnsManager *self,
+ 
+ 		key_mask = umask (0077);
+-		if (!g_file_set_contents (NMSTATEDIR "/secret_key", (char *) secret_key, key_len, error)) {
+-			g_prefix_error (error, "Can't write " NMSTATEDIR "/secret_key: ");
++
++		if (!g_file_set_contents (secret_key_path, (char *) secret_key, key_len, error)) {
++			g_prefix_error (error, "Can't write %s/secret_key: ", secret_key_path);
+ 			key_len = 0;
  		}
+ 		umask (key_mask);
  	}
  
--	if ((f = fopen (MY_RESOLV_CONF_TMP, "we")) == NULL) {
-+	if ((f = fopen (my_resolv_conf_tmp, "we")) == NULL) {
- 		errsv = errno;
- 		g_set_error (error,
- 		             NM_MANAGER_ERROR,
- 		             NM_MANAGER_ERROR_FAILED,
- 		             "Could not open %s: %s",
--		             MY_RESOLV_CONF_TMP,
-+		             my_resolv_conf_tmp,
- 		             g_strerror (errsv));
- 		_LOGT ("update-resolv-conf: open temporary file %s failed (%s)",
--		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-+		       my_resolv_conf_tmp, g_strerror (errsv));
- 		return SR_ERROR;
- 	}
+ out:
++	g_free (secret_key_path);
+ 	if (key_len) {
+ 		*out_key_len = key_len;
+ 		return secret_key;
+@@ -3854,6 +3860,74 @@ nm_utils_ip4_address_is_link_local (in_addr_t addr)
  
-@@ -706,7 +709,7 @@ update_resolv_conf (NMDnsManager *self,
- 	if (!success) {
- 		errsv = errno;
- 		_LOGT ("update-resolv-conf: write temporary file %s failed (%s)",
--		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-+		       my_resolv_conf_tmp, g_strerror (errsv));
- 	}
+ /*****************************************************************************/
  
- 	if (fclose (f) < 0) {
-@@ -719,25 +722,25 @@ update_resolv_conf (NMDnsManager *self,
- 			             NM_MANAGER_ERROR,
- 			             NM_MANAGER_ERROR_FAILED,
- 			             "Could not close %s: %s",
--			             MY_RESOLV_CONF_TMP,
-+			             my_resolv_conf_tmp,
- 			             g_strerror (errsv));
- 			_LOGT ("update-resolv-conf: close temporary file %s failed (%s)",
--			       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-+			       my_resolv_conf_tmp, g_strerror (errsv));
- 		}
- 		return SR_ERROR;
- 	} else if (!success)
- 		return SR_ERROR;
++const char*
++nm_utils_get_state_dir(void)
++{
++	static const char *state_dir = NULL;
++
++	if (!state_dir)
++		state_dir = g_strdup_printf("%s/state", getenv("SNAP_DATA"));
++
++	return state_dir;
++}
++
++const char*
++nm_utils_get_run_dir(void)
++{
++	static const char *run_dir = NULL;
++
++	if (!run_dir)
++		run_dir = g_strdup_printf("%s/run", getenv("SNAP_DATA"));
++
++	return run_dir;
++}
++
++const char*
++nm_utils_get_plugin_dir(void)
++{
++	static const char *plugin_dir = NULL;
++
++	if (!plugin_dir)
++		plugin_dir = g_strdup_printf("%s/%s", getenv("SNAP"), NMPLUGINDIR);
++
++	return plugin_dir;
++}
++
++const char*
++nm_utils_get_conf_dir(void)
++{
++	static const char *conf_dir = NULL;
++
++	if (!conf_dir)
++		conf_dir = g_strdup_printf("%s/conf", getenv("SNAP_DATA"));
++
++	return conf_dir;
++}
++
++const char*
++nm_utils_get_pppd_plugin_dir (void)
++{
++	static const char *pppd_plugin_dir = NULL;
++
++	if (!pppd_plugin_dir)
++		pppd_plugin_dir = g_strdup_printf("%s%s", getenv("SNAP"), PPPD_PLUGIN_DIR);
++
++	return pppd_plugin_dir;
++}
++
++const char*
++nm_utils_get_conf_device_state_dir (void)
++{
++	static const char *conf_device_state_dir = NULL;
++
++	if (!conf_device_state_dir)
++		conf_device_state_dir = g_strdup_printf("%s/devices", nm_utils_get_run_dir());
++
++	return conf_device_state_dir;
++}
++
++/*****************************************************************************/
++
+ /**
+  * Takes a pair @timestamp and @duration, and returns the remaining duration based
+  * on the new timestamp @now.
+diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
+index f43648c1b..249c0d87e 100644
+--- a/src/nm-core-utils.h
++++ b/src/nm-core-utils.h
+@@ -419,6 +419,13 @@ gboolean nm_utils_lifetime_get (guint32 timestamp,
  
--	if (rename (MY_RESOLV_CONF_TMP, MY_RESOLV_CONF) < 0) {
-+	if (rename (my_resolv_conf_tmp, my_resolv_conf) < 0) {
- 		errsv = errno;
- 		g_set_error (error,
- 		             NM_MANAGER_ERROR,
- 		             NM_MANAGER_ERROR_FAILED,
- 		             "Could not replace %s: %s",
--		             MY_RESOLV_CONF,
-+		             my_resolv_conf,
- 		             g_strerror (errno));
- 		_LOGT ("update-resolv-conf: failed to rename temporary file %s to %s (%s)",
--		       MY_RESOLV_CONF_TMP, MY_RESOLV_CONF, g_strerror (errsv));
-+		       my_resolv_conf_tmp, my_resolv_conf, g_strerror (errsv));
- 		return SR_ERROR;
+ gboolean nm_utils_ip4_address_is_link_local (in_addr_t addr);
+ 
++const char* nm_utils_get_state_dir (void);
++const char* nm_utils_get_run_dir (void);
++const char* nm_utils_get_plugin_dir (void);
++const char* nm_utils_get_conf_dir (void);
++const char* nm_utils_get_pppd_plugin_dir (void);
++const char* nm_utils_get_conf_device_state_dir (void);
++
+ const char *nm_utils_dnsmasq_status_to_string (int status, char *dest, gsize size);
+ 
+ void nm_utils_get_reverse_dns_domains_ip4 (guint32 ip, guint8 plen, GPtrArray *domains);
+diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
+index 1493ef197..0b1712da1 100644
+--- a/src/nm-iface-helper.c
++++ b/src/nm-iface-helper.c
+@@ -48,8 +48,6 @@
+ # define NM_DIST_VERSION VERSION
+ #endif
+ 
+-#define NMIH_PID_FILE_FMT NMRUNDIR "/nm-iface-helper-%d.pid"
+-
+ /*****************************************************************************/
+ 
+ static struct {
+@@ -385,7 +383,7 @@ main (int argc, char *argv[])
+ 		fprintf (stderr, _("Failed to find interface index for %s (%s)\n"), global_opt.ifname, strerror (errno));
+ 		return 1;
  	}
+-	pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, gl.ifindex);
++	pidfile = g_strdup_printf ("%s/nm-iface-helper-%d.pid", nm_utils_get_run_dir(), gl.ifindex);
+ 	nm_main_utils_ensure_not_running_pidfile (pidfile);
  
-@@ -749,14 +752,14 @@ update_resolv_conf (NMDnsManager *self,
+ 	nm_main_utils_ensure_rundir ();
+diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
+index 743f80a2b..cc0c38241 100644
+--- a/src/ppp/nm-ppp-manager.c
++++ b/src/ppp/nm-ppp-manager.c
+@@ -57,7 +57,7 @@
  
- 	if (   rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
- 	    || !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link)) {
--		_LOGT ("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF);
-+		_LOGT ("update-resolv-conf: write internal file %s succeeded", my_resolv_conf);
- 		return SR_SUCCESS;
+ #include "introspection/org.freedesktop.NetworkManager.PPP.h"
+ 
+-#define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so"
++#define NM_PPPD_PLUGIN "nm-pppd-plugin.so"
+ 
+ static NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark)
+ 
+@@ -739,6 +739,7 @@ create_pppd_cmd_line (NMPPPManager *self,
+ 	const char *pppd_binary = NULL;
+ 	NMCmdLine *cmd;
+ 	gboolean ppp_debug;
++	char *pppd_plugin_dir;
+ 	static int unit;
+ 
+ 	g_return_val_if_fail (setting != NULL, NULL);
+@@ -901,8 +902,12 @@ create_pppd_cmd_line (NMPPPManager *self,
+ 	nm_cmd_line_add_string (cmd, "ipparam");
+ 	nm_cmd_line_add_string (cmd, nm_exported_object_get_path (NM_EXPORTED_OBJECT (self)));
+ 
++	pppd_plugin_dir = g_strdup_printf ("%s/%s", nm_utils_get_pppd_plugin_dir (), NM_PPPD_PLUGIN);
++
+ 	nm_cmd_line_add_string (cmd, "plugin");
+-	nm_cmd_line_add_string (cmd, NM_PPPD_PLUGIN);
++	nm_cmd_line_add_string (cmd, pppd_plugin_dir);
++
++	g_free (pppd_plugin_dir);
+ 
+ 	if (pppoe && nm_setting_pppoe_get_parent (pppoe)) {
+ 		/* The PPP interface is going to be renamed, so pass a
+diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
+index 586263721..709ee6710 100644
+--- a/src/settings/nm-settings-connection.c
++++ b/src/settings/nm-settings-connection.c
+@@ -41,9 +41,6 @@
+ 
+ #include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
+ 
+-#define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"
+-#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
+-
+ #define AUTOCONNECT_RETRIES_UNSET        -2
+ #define AUTOCONNECT_RETRIES_FOREVER      -1
+ #define AUTOCONNECT_RESET_RETRIES_TIMER 300
+@@ -146,6 +143,27 @@ G_DEFINE_TYPE_WITH_CODE (NMSettingsConnection, nm_settings_connection, NM_TYPE_E
+ 
+ /*****************************************************************************/
+ 
++static const char *get_settings_timestamps_path()
++{
++	static const char *timestamps_path = NULL;
++
++	if (!timestamps_path)
++		timestamps_path = g_strdup_printf("%s/timestamps", nm_utils_get_state_dir());
++
++	return timestamps_path;
++}
++
++static const char *get_settings_seen_bssids_path()
++{
++	static const char *seen_bssids_path = NULL;
++
++	if (!seen_bssids_path)
++		seen_bssids_path = g_strdup_printf("%s/seen-bssids", nm_utils_get_state_dir());
++	return seen_bssids_path;
++}
++
++/*****************************************************************************/
++
+ static void
+ _emit_updated (NMSettingsConnection *self, gboolean by_user)
+ {
+@@ -748,9 +766,9 @@ remove_entry_from_db (NMSettingsConnection *self, const char* db_name)
+ 	const char *db_file;
+ 
+ 	if (strcmp (db_name, "timestamps") == 0)
+-		db_file = SETTINGS_TIMESTAMPS_FILE;
++		db_file = get_settings_timestamps_path();
+ 	else if (strcmp (db_name, "seen-bssids") == 0)
+-		db_file = SETTINGS_SEEN_BSSIDS_FILE;
++		db_file = get_settings_seen_bssids_path();
+ 	else
+ 		return;
+ 
+@@ -2432,9 +2450,9 @@ nm_settings_connection_update_timestamp (NMSettingsConnection *self,
+ 
+ 	/* Save timestamp to timestamps database file */
+ 	timestamps_file = g_key_file_new ();
+-	if (!g_key_file_load_from_file (timestamps_file, SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
++	if (!g_key_file_load_from_file (timestamps_file, get_settings_timestamps_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
+ 		if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+-			_LOGW ("error parsing timestamps file '%s': %s", SETTINGS_TIMESTAMPS_FILE, error->message);
++			_LOGW ("error parsing timestamps file '%s': %s", get_settings_timestamps_path(), error->message);
+ 		g_clear_error (&error);
  	}
  
- 	if (!nm_streq0 (_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link),
--	                MY_RESOLV_CONF)) {
-+	                my_resolv_conf)) {
- 		_LOGT ("update-resolv-conf: write internal file %s succeeded (don't touch symlink %s linking to %s)",
--		       MY_RESOLV_CONF, _PATH_RESCONF,
-+		       my_resolv_conf, _PATH_RESCONF,
- 		       _read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link));
- 		return SR_SUCCESS;
+@@ -2445,11 +2463,11 @@ nm_settings_connection_update_timestamp (NMSettingsConnection *self,
+ 
+ 	data = g_key_file_to_data (timestamps_file, &len, &error);
+ 	if (data) {
+-		g_file_set_contents (SETTINGS_TIMESTAMPS_FILE, data, len, &error);
++		g_file_set_contents (get_settings_timestamps_path(), data, len, &error);
+ 		g_free (data);
  	}
-@@ -775,22 +778,22 @@ update_resolv_conf (NMDnsManager *self,
- 		             g_strerror (errsv));
- 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
- 		       "but canot delete temporary file %s: %s",
--		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
-+		       my_resolv_conf, RESOLV_CONF_TMP, g_strerror (errsv));
- 		return SR_ERROR;
+ 	if (error) {
+-		_LOGW ("error saving timestamp to file '%s': %s", SETTINGS_TIMESTAMPS_FILE, error->message);
++		_LOGW ("error saving timestamp to file '%s': %s", get_settings_timestamps_path(), error->message);
+ 		g_error_free (error);
  	}
+ 	g_key_file_free (timestamps_file);
+@@ -2475,7 +2493,7 @@ nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *self)
+ 	g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self));
  
--	if (symlink (MY_RESOLV_CONF, RESOLV_CONF_TMP) == -1) {
-+	if (symlink (my_resolv_conf, RESOLV_CONF_TMP) == -1) {
- 		errsv = errno;
- 		g_set_error (error,
- 		             NM_MANAGER_ERROR,
- 		             NM_MANAGER_ERROR_FAILED,
- 		             "Could not create symlink %s pointing to %s: %s",
- 		             RESOLV_CONF_TMP,
--		             MY_RESOLV_CONF,
-+		             my_resolv_conf,
- 		             g_strerror (errsv));
- 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
- 		       "but failed to symlink %s: %s",
--		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
-+		       my_resolv_conf, RESOLV_CONF_TMP, g_strerror (errsv));
- 		return SR_ERROR;
+ 	timestamps_file = g_key_file_new ();
+-	if (!g_key_file_load_from_file (timestamps_file, SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
++	if (!g_key_file_load_from_file (timestamps_file, get_settings_timestamps_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
+ 		_LOGD ("failed to read connection timestamp: %s", error->message);
+ 		return;
  	}
+@@ -2585,10 +2603,10 @@ nm_settings_connection_add_seen_bssid (NMSettingsConnection *self,
+ 	/* Save BSSID to seen-bssids file */
+ 	seen_bssids_file = g_key_file_new ();
+ 	g_key_file_set_list_separator (seen_bssids_file, ',');
+-	if (!g_key_file_load_from_file (seen_bssids_file, SETTINGS_SEEN_BSSIDS_FILE, G_KEY_FILE_KEEP_COMMENTS, &error)) {
++	if (!g_key_file_load_from_file (seen_bssids_file, get_settings_seen_bssids_path(), G_KEY_FILE_KEEP_COMMENTS, &error)) {
+ 		if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+ 			_LOGW ("error parsing seen-bssids file '%s': %s",
+-			       SETTINGS_SEEN_BSSIDS_FILE, error->message);
++			       get_settings_seen_bssids_path(), error->message);
+ 		}
+ 		g_clear_error (&error);
+ 	}
+@@ -2599,14 +2617,14 @@ nm_settings_connection_add_seen_bssid (NMSettingsConnection *self,
  
-@@ -805,12 +808,12 @@ update_resolv_conf (NMDnsManager *self,
- 		             g_strerror (errsv));
- 		_LOGT ("update-resolv-conf: write internal file %s succeeded "
- 		       "but failed to rename temporary symlink %s to %s: %s",
--		       MY_RESOLV_CONF, RESOLV_CONF_TMP, _PATH_RESCONF, g_strerror (errsv));
-+		       my_resolv_conf, RESOLV_CONF_TMP, _PATH_RESCONF, g_strerror (errsv));
- 		return SR_ERROR;
+ 	data = g_key_file_to_data (seen_bssids_file, &len, &error);
+ 	if (data) {
+-		g_file_set_contents (SETTINGS_SEEN_BSSIDS_FILE, data, len, &error);
++		g_file_set_contents (get_settings_seen_bssids_path(), data, len, &error);
+ 		g_free (data);
  	}
+ 	g_key_file_free (seen_bssids_file);
  
- 	_LOGT ("update-resolv-conf: write internal file %s succeeded and update symlink %s",
--	       MY_RESOLV_CONF, _PATH_RESCONF);
-+	       my_resolv_conf, _PATH_RESCONF);
- 	return SR_SUCCESS;
+ 	if (error) {
+ 		_LOGW ("error saving seen-bssids to file '%s': %s",
+-		       SETTINGS_SEEN_BSSIDS_FILE, error->message);
++		       get_settings_seen_bssids_path(), error->message);
+ 		g_error_free (error);
+ 	}
  }
+@@ -2631,7 +2649,7 @@ nm_settings_connection_read_and_fill_seen_bssids (NMSettingsConnection *self)
+ 	/* Get seen BSSIDs from database file */
+ 	seen_bssids_file = g_key_file_new ();
+ 	g_key_file_set_list_separator (seen_bssids_file, ',');
+-	if (g_key_file_load_from_file (seen_bssids_file, SETTINGS_SEEN_BSSIDS_FILE, G_KEY_FILE_KEEP_COMMENTS, NULL)) {
++	if (g_key_file_load_from_file (seen_bssids_file, get_settings_seen_bssids_path(), G_KEY_FILE_KEEP_COMMENTS, NULL)) {
+ 		connection_uuid = nm_settings_connection_get_uuid (self);
+ 		tmp_strv = g_key_file_get_string_list (seen_bssids_file, "seen-bssids", connection_uuid, &len, NULL);
+ 	}
+diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
+index 8e3fc582e..6ccccd250 100644
+--- a/src/settings/nm-settings.c
++++ b/src/settings/nm-settings.c
+@@ -76,6 +76,7 @@
+ #include "NetworkManagerUtils.h"
+ #include "nm-dispatcher.h"
+ #include "nm-hostname-manager.h"
++#include "nm-core-utils.h"
  
-@@ -1660,6 +1663,8 @@ again:
- 			_clear_plugin (self);
- 			priv->plugin = nm_dns_systemd_resolved_new ();
- 			plugin_changed = TRUE;
+ #include "introspection/org.freedesktop.NetworkManager.Settings.h"
+ 
+@@ -717,7 +718,7 @@ load_plugin:
+ 			int errsv;
+ 
+ 			full_name = g_strdup_printf ("nm-settings-plugin-%s", pname);
+-			path = g_module_build_path (NMPLUGINDIR, full_name);
++			path = g_module_build_path (nm_utils_get_plugin_dir(), full_name);
+ 
+ 			if (stat (path, &st) != 0) {
+ 				errsv = errno;
+diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
+index 03f06670f..999495acc 100644
+--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
++++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
+@@ -30,8 +30,6 @@
+ #include "nm-setting-wireless-security.h"
+ #include "nm-config.h"
+ 
+-#define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections"
+-
+ /*****************************************************************************/
+ 
+ static const char temp_letters[] =
+@@ -163,7 +161,8 @@ nms_keyfile_utils_get_path (void)
+ 		                                 NM_CONFIG_KEYFILE_KEY_KEYFILE_PATH,
+ 		                                 NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY);
+ 		if (!path)
+-			path = g_strdup (""NM_CONFIG_KEYFILE_PATH_DEFAULT"");
++			path = g_strdup_printf ("%s/system-connections", nm_utils_get_conf_dir());
 +
-+			_LOGI ("init: plugin_changed: systemd-resolvd");
- 		}
- 		mode = "systemd-resolved";
- 	} else if (nm_streq0 (mode, "dnsmasq")) {
+ 	}
+ 	return path;
+ }
+-- 
+2.17.1
+
diff --git a/debian/patches/disable-tests-that-fail-under-launchpad-builds.patch b/snap-patch/networkmanager/0005-Disable-tests-that-fail-on-LP-build.patch
similarity index 87%
rename from debian/patches/disable-tests-that-fail-under-launchpad-builds.patch
rename to snap-patch/networkmanager/0005-Disable-tests-that-fail-on-LP-build.patch
index f77ac03..8660aba 100644
--- a/debian/patches/disable-tests-that-fail-under-launchpad-builds.patch
+++ b/snap-patch/networkmanager/0005-Disable-tests-that-fail-on-LP-build.patch
@@ -1,5 +1,19 @@
+From e613ccfb5358c867c7d77b7d0e1d9f30e9f63e05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
+ <[e-mail]>
+Date: Thu, 30 Jan 2020 13:28:52 +0100
+Subject: [PATCH 5/6] Disable tests that fail on LP build
+
+---
+ src/devices/tests/test-arping.c      | 3 +++
+ src/platform/tests/test-address.c    | 3 +++
+ src/platform/tests/test-link.c       | 9 +++++++--
+ src/platform/tests/test-nmp-object.c | 2 +-
+ src/platform/tests/test-route.c      | 3 +++
+ 5 files changed, 17 insertions(+), 3 deletions(-)
+
 diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c
-index bcbc1140..2de53b2b 100644
+index bcbc1140d..2de53b2b0 100644
 --- a/src/devices/tests/test-arping.c
 +++ b/src/devices/tests/test-arping.c
 @@ -135,6 +135,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
@@ -13,7 +27,7 @@ index bcbc1140..2de53b2b 100644
  	g_test_add ("/arping/2", test_fixture, NULL, fixture_setup, test_arping_2, fixture_teardown);
  }
 diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c
-index 93851ff7..a6e53c83 100644
+index 93851ff7e..a6e53c833 100644
 --- a/src/platform/tests/test-address.c
 +++ b/src/platform/tests/test-address.c
 @@ -368,6 +368,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
@@ -27,7 +41,7 @@ index 93851ff7..a6e53c83 100644
  	add_test_func ("/address/ipv4/general", test_ip4_address_general);
  	add_test_func ("/address/ipv6/general", test_ip6_address_general);
 diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
-index ef78cc24..37189d9f 100644
+index ef78cc244..37189d9f4 100644
 --- a/src/platform/tests/test-link.c
 +++ b/src/platform/tests/test-link.c
 @@ -475,13 +475,15 @@ test_bond (void)
@@ -59,7 +73,7 @@ index ef78cc24..37189d9f 100644
  	g_test_add_func ("/link/loopback", test_loopback);
  	g_test_add_func ("/link/internal", test_internal);
 diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
-index 3228de83..7f7174f5 100644
+index 3228de834..7f7174f51 100644
 --- a/src/platform/tests/test-nmp-object.c
 +++ b/src/platform/tests/test-nmp-object.c
 @@ -587,7 +587,7 @@ main (int argc, char **argv)
@@ -72,7 +86,7 @@ index 3228de83..7f7174f5 100644
  
  	result = g_test_run ();
 diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
-index 13648f16..665a5937 100644
+index 13648f16e..665a59370 100644
 --- a/src/platform/tests/test-route.c
 +++ b/src/platform/tests/test-route.c
 @@ -885,6 +885,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
@@ -85,3 +99,6 @@ index 13648f16..665a5937 100644
  #define add_test_func(testpath, test_func) nmtstp_env1_add_test_func(testpath, test_func, TRUE)
  #define add_test_func_data(testpath, test_func, arg) nmtstp_env1_add_test_func_data(testpath, test_func, arg, TRUE)
  	add_test_func ("/route/ip4", test_ip4_route);
+-- 
+2.17.1
+
diff --git a/debian/patches/snap-support-ppp.patch b/snap-patch/networkmanager/0006-Add-snap-support-for-ppp.patch
similarity index 85%
rename from debian/patches/snap-support-ppp.patch
rename to snap-patch/networkmanager/0006-Add-snap-support-for-ppp.patch
index 5b13a63..9d1faf6 100644
--- a/debian/patches/snap-support-ppp.patch
+++ b/snap-patch/networkmanager/0006-Add-snap-support-for-ppp.patch
@@ -1,7 +1,62 @@
-Index: build/src/ppp/nm-ppp-manager-call.c
-===================================================================
---- build.orig/src/ppp/nm-ppp-manager-call.c
-+++ build/src/ppp/nm-ppp-manager-call.c
+From 72b96e130664e28b73d9f9b34d4c6d829e840e27 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
+ <[e-mail]>
+Date: Thu, 30 Jan 2020 13:29:46 +0100
+Subject: [PATCH 6/6] Add snap support for ppp
+
+---
+ src/nm-core-utils.c           | 30 +++++++++++++++++++++++++-
+ src/ppp/nm-ppp-manager-call.c | 40 ++++++++++++++++++++---------------
+ 2 files changed, 52 insertions(+), 18 deletions(-)
+
+diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
+index b33203681..775291edd 100644
+--- a/src/nm-core-utils.c
++++ b/src/nm-core-utils.c
+@@ -1171,10 +1171,38 @@ const char *const NM_PATHS_DEFAULT[] = {
+ 	NULL,
+ };
+ 
++const char *const *
++utils_get_search_paths(void)
++{
++	static char **paths;
++
++	const char *snap_path;
++
++	if (paths)
++		return (const char *const *) paths;
++
++	snap_path = getenv("SNAP");
++	if (snap_path) {
++		unsigned np, i;
++
++		np = g_strv_length((char **) NM_PATHS_DEFAULT);
++		paths = malloc(sizeof(char *)*(np*2 + 1));
++		for (i = 0; i < np; ++i) {
++			paths[i] = g_strdup_printf("%s%s", snap_path, NM_PATHS_DEFAULT[i]);
++			paths[np + i] = g_strdup(NM_PATHS_DEFAULT[i]);
++		}
++		paths[2*np] = NULL;
++	} else {
++		paths = g_strdupv((char **) NM_PATHS_DEFAULT);;
++	}
++
++	return (const char *const *) paths;
++}
++
+ const char *
+ nm_utils_find_helper(const char *progname, const char *try_first, GError **error)
+ {
+-	return nm_utils_file_search_in_paths (progname, try_first, NM_PATHS_DEFAULT, G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
++	return nm_utils_file_search_in_paths (progname, try_first, utils_get_search_paths (), G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
+ }
+ 
+ /*****************************************************************************/
+diff --git a/src/ppp/nm-ppp-manager-call.c b/src/ppp/nm-ppp-manager-call.c
+index ad3307a9d..12fe18338 100644
+--- a/src/ppp/nm-ppp-manager-call.c
++++ b/src/ppp/nm-ppp-manager-call.c
 @@ -30,7 +30,7 @@
  #include "nm-core-utils.h"
  #include "nm-ppp-plugin-api.h"
@@ -72,7 +127,7 @@ Index: build/src/ppp/nm-ppp-manager-call.c
  		}
  
  		/* after loading glib types from the plugin, we cannot unload the library anymore.
-@@ -90,11 +93,14 @@ nm_ppp_manager_create (const char *iface
+@@ -90,11 +93,14 @@ nm_ppp_manager_create (const char *iface, GError **error)
  
  		ppp_ops = ops;
  
@@ -88,47 +143,6 @@ Index: build/src/ppp/nm-ppp-manager-call.c
  	return ret;
  }
  
-Index: build/src/nm-core-utils.c
-===================================================================
---- build.orig/src/nm-core-utils.c
-+++ build/src/nm-core-utils.c
-@@ -1171,10 +1171,38 @@ const char *const NM_PATHS_DEFAULT[] = {
- 	NULL,
- };
- 
-+const char *const *
-+utils_get_search_paths(void)
-+{
-+	static char **paths;
-+
-+	const char *snap_path;
-+
-+	if (paths)
-+		return (const char *const *) paths;
-+
-+	snap_path = getenv("SNAP");
-+	if (snap_path) {
-+		unsigned np, i;
-+
-+		np = g_strv_length((char **) NM_PATHS_DEFAULT);
-+		paths = malloc(sizeof(char *)*(np*2 + 1));
-+		for (i = 0; i < np; ++i) {
-+			paths[i] = g_strdup_printf("%s%s", snap_path, NM_PATHS_DEFAULT[i]);
-+			paths[np + i] = g_strdup(NM_PATHS_DEFAULT[i]);
-+		}
-+		paths[2*np] = NULL;
-+	} else {
-+		paths = g_strdupv((char **) NM_PATHS_DEFAULT);;
-+	}
-+
-+	return (const char *const *) paths;
-+}
-+
- const char *
- nm_utils_find_helper(const char *progname, const char *try_first, GError **error)
- {
--	return nm_utils_file_search_in_paths (progname, try_first, NM_PATHS_DEFAULT, G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
-+	return nm_utils_file_search_in_paths (progname, try_first, utils_get_search_paths (), G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
- }
- 
- /*****************************************************************************/
+-- 
+2.17.1
+
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index dfa30b8..77bbb1a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,7 +1,5 @@
 name: network-manager
-version: 1.10.6-2
-version-script: |
-    echo $SNAPCRAFT_PROJECT_VERSION-$(date +%Y%m%d)+$(git rev-parse --short HEAD)
+version: 1.10.6-3-dev
 summary: Network Manager
 description: |
   NetworkManager is a system network service that manages your network
@@ -9,7 +7,7 @@ description: |
   when available. It manages ethernet, WiFi, mobile broadband (WWAN) and
   PPPoE devices, provides VPN integration with a variety of different
   VPN serivces.
-  Please find the source code at: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu/+ref/snap-1.10
+  Please find the source code at: https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/+ref/snap-1.10
 base: core18
 confinement: strict
 grade: stable
@@ -50,11 +48,8 @@ apps:
     command: bin/networkmanager
     daemon: simple
     slots: [service]
-    plugs: [modem-manager, ppp, network-setup-observe, wpa, firewall-control, hardware-observe]
-
-layout:
-  /usr/lib/x86_64-linux-gnu/xtables:
-    bind: $SNAP/usr/lib/x86_64-linux-gnu/xtables
+    plugs: [modem-manager, ppp, network-setup-observe, wpa, firewall-control,
+            hardware-observe, network-setup-control]
 
 parts:
   networkmanager-common:
@@ -72,13 +67,13 @@ parts:
     plugin: make
     source: https://git.launchpad.net/ubuntu/+source/dnsmasq
     source-type: git
-    source-branch: applied/ubuntu/bionic
+    source-branch: applied/2.79-1
     build-packages:
       - build-essential
     make-parameters:
       - PREFIX=/
     override-build: |
-      git apply ../../../snap-patch/dnsmasq.patch
+      git apply "$SNAPCRAFT_PROJECT_DIR"/snap-patch/dnsmasq.patch
       snapcraftctl build
     filesets:
       binaries:
@@ -110,7 +105,9 @@ parts:
   #    - $wanted
   networkmanager:
     plugin: autotools
-    source: .
+    source: https://git.launchpad.net/ubuntu/+source/network-manager
+    source-type: git
+    source-branch: applied/1.10.6-2ubuntu1.2
     build-packages:
       - intltool
       - libdbus-glib-1-dev
@@ -154,7 +151,7 @@ parts:
       - --with-dhcpcd=no
       - --with-dhclient=no
       - --with-dnsmasq=no
-      - --with-iptables=/snap/$SNAPCRAFT_PROJECT_NAME/current/sbin/iptables
+      - --with-iptables=/sbin/iptables
       - --with-systemd-journal=yes
       - --libexecdir=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/lib/NetworkManager
       - --with-pppd=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/sbin/pppd
@@ -194,9 +191,9 @@ parts:
       # Set explicitly CFLAGS until lp: #1791946 is solved
       - CFLAGS=-O2
     override-build: |
-      echo "networkmanager override-build called <patches go here>"
-      export QUILT_PATCHES=debian/patches
-      quilt push -a
+      git config user.email "[e-mail]"
+      git config user.name "snapcraft"
+      git am "$SNAPCRAFT_PROJECT_DIR"/snap-patch/networkmanager/*.patch
 
       # remove configure to trigger autotools
       rm ./configure
@@ -205,24 +202,17 @@ parts:
       # Run all tests NetworkManager ships by default
       make check
     stage-packages:
-      - iptables
       - iputils-arping
       - libasn1-8-heimdal
       - libdbus-glib-1-2
       - libcurl3-gnutls
       - libgssapi3-heimdal
-      - libgssapi-krb5-2
       - libhcrypto4-heimdal
       - libheimbase1-heimdal
       - libheimntlm0-heimdal
       - libhx509-5-heimdal
-      - libidn2-0
       - libjansson4
-      - libkeyutils1
-      - libkrb5-3
       - libkrb5-26-heimdal
-      - libkrb5support0
-      - libk5crypto3
       - libldap-2.4-2
       - libmm-glib0
       - libnewt0.52
@@ -230,36 +220,17 @@ parts:
       - libroken18-heimdal
       - libndp0
       - libpsl5
-      - libreadline7
       - librtmp1
       - libsasl2-2
       - libteamdctl0
-      - libunistring2
-      - libblkid1
-      - libgcrypt20
-      - libgpg-error0
-      - liblzma5
-      - libmount1
-      - libnl-3-200
-      - libpcre3
-      - libselinux1
-      - libuuid1
-      - zlib1g
-      - libgmp10
-      - libgnutls30
-      - libhogweed4
-      - liblz4-1
-      - libnettle6
-      - libp11-kit0
       - libslang2
-      - libtasn1-6
       - libwind0-heimdal
       - ppp
       - resolvconf
 
     override-stage: |
       snapcraftctl stage
-      patch -p1 < "$SNAPCRAFT_PART_SRC"/snap-patch/resolvconf.patch
+      patch -p1 < "$SNAPCRAFT_PROJECT_DIR"/snap-patch/resolvconf.patch
 
     # Filter files pulled in by stage-packages so they aren't
     # included in the final snap. We only need them to build
@@ -268,7 +239,6 @@ parts:
     # here are the results of the network manager build.
     filesets:
       binaries:
-        - sbin/*tables*
         - sbin/resolvconf
         - usr/bin/arping
         - usr/bin/nmcli
@@ -285,7 +255,34 @@ parts:
         - etc/NetworkManager/*
         - etc/resolvconf/update.d/libc
       docs:
-        - usr/share/doc/*/copyright
+        - usr/share/doc/dnsmasq/copyright
+        - usr/share/doc/iputils-arping/copyright
+        - usr/share/doc/libasn1-8-heimdal/copyright
+        - usr/share/doc/libcurl3-gnutls/copyright
+        - usr/share/doc/libdbus-glib-1-2/copyright
+        - usr/share/doc/libgssapi3-heimdal/copyright
+        - usr/share/doc/libhcrypto4-heimdal/copyright
+        - usr/share/doc/libheimbase1-heimdal/copyright
+        - usr/share/doc/libheimntlm0-heimdal/copyright
+        - usr/share/doc/libhx509-5-heimdal/copyright
+        - usr/share/doc/libjansson4/copyright
+        - usr/share/doc/libkrb5-26-heimdal/copyright
+        - usr/share/doc/libldap-2.4-2/copyright
+        - usr/share/doc/libmm-glib0/copyright
+        - usr/share/doc/libndp0/copyright
+        - usr/share/doc/libnewt0.52/copyright
+        - usr/share/doc/libnghttp2-14/copyright
+        - usr/share/doc/libpcap0.8/copyright
+        - usr/share/doc/libpsl5/copyright
+        - usr/share/doc/libroken18-heimdal/copyright
+        - usr/share/doc/librtmp1/copyright
+        - usr/share/doc/libsasl2-2/copyright
+        - usr/share/doc/libslang2/copyright
+        - usr/share/doc/libteamdctl0/copyright
+        - usr/share/doc/libwind0-heimdal/copyright
+        - usr/share/doc/network-manager/copyright
+        - usr/share/doc/ppp/copyright
+        - usr/share/doc/resolvconf/copyright
       libs:
         - lib/resolvconf/list-records
         - lib/*/libnewt*
@@ -318,8 +315,6 @@ parts:
         - usr/lib/*/libsasl2*
         - usr/lib/*/libteamdctl*
         - usr/lib/*/libwind*
-        - usr/lib/*/libxtables*
-        - usr/lib/*/xtables/*
       unwanted:
         # We don't use dhclient so we don't need this helper
         - -usr/lib/NetworkManager/nm-dhcp-helper
@@ -335,3 +330,20 @@ parts:
       - $docs
       - $libs
       - $unwanted
+
+  # This part is to make sure we get notifications from the review tools
+  networkmanager-phony:
+    plugin: nil
+    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools
+    source-type: git
+    build-packages:
+      - python3-minimal
+      - python3-yaml
+    stage-packages:
+      - network-manager
+      - dnsmasq-base
+    # Check versions and make sure nothing from the staged packages is installed
+    override-build: |
+      ./build-tools/cmp-stage-build.py \
+          networkmanager network-manager dnsmasq dnsmasq-base
+      rm -rf ../install/*
diff --git a/tests/main/can-exec-iptables/task.yaml b/tests/main/can-exec-iptables/task.yaml
index eeffe75..c210bbe 100644
--- a/tests/main/can-exec-iptables/task.yaml
+++ b/tests/main/can-exec-iptables/task.yaml
@@ -6,6 +6,5 @@ execute: |
     # from the core snap or not.
     snap run --shell network-manager.networkmanager <<EOF
     set -ex
-    export LD_LIBRARY_PATH=/snap/network-manager/current/lib:/snap/network-manager/current/usr/lib:/snap/network-manager/current/lib/$(arch)-linux-gnu:/snap/network-manager/current/usr/lib/$(arch)-linux-gnu:/snap/network-manager/current/usr/lib/NetworkManager
-    /snap/network-manager/current/sbin/iptables -L
+    iptables -L
     EOF
diff --git a/unstage.txt b/unstage.txt
new file mode 100644
index 0000000..e8997c1
--- /dev/null
+++ b/unstage.txt
@@ -0,0 +1,22 @@
+init-system-helpers
+libcom-err2
+libdbus-1-3
+libffi6
+libglib2.0-0
+libgmp10
+libgnutls30
+libgssapi-krb5-2
+libhogweed4
+libidn2-0
+libk5crypto3
+libkeyutils1
+libkrb5-3
+libkrb5support0
+libldap-common
+libnettle6
+libp11-kit0
+libsasl2-modules-db
+libsqlite3-0
+libssl1.1
+libtasn1-6
+libunistring2