Merge ~morphis/snappy-hwe-snaps/+git/wpa-supplicant:f/disable-old-dbus-endpoint into ~snappy-hwe-team/snappy-hwe-snaps/+git/wpa-supplicant:wpa-supplicant/xenial/2.4

[Simon Fels]

SNAP: Disable old dbus endpoint to workaround a problem with snap-declarations

The store/snapd currently doesn't allow us to specify a snap-declaration
with two slots using the dbus interface. We disable the legacy endpoint
here as it isn't used by any service we support.

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

FAILED: Continuous integration, rev:f370df06ccd122f74ec3c2d129fd742bbdc674bf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1371/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/640/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1279/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1272/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/290/console

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

review: Needs Fixing (continuous-integration)

[Tony Espy (awe)]

LGTM

review: Approve

[Simon Fels (morphis)]

Ok, got another updated from Jamie and we don't need to do this anymore. He got the problems fixed on the store side.

Unmerged commits

f370df0... by Simon Fels on 2017-03-21

SNAP: Disable old dbus endpoint to workaround a problem with snap-declarations

The store/snapd currently doesn't allow us to specify a snap-declaration
with two slots using the dbus interface. We disable the legacy endpoint
here as it isn't used by any service we support.

diff --git a/default-config b/default-config
index 8f543d7..1ec7f94 100644
--- a/default-config
+++ b/default-config
@@ -331,7 +331,13 @@ CONFIG_TLSV12=y
 
 # Add support for old DBus control interface
 # (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
+#
+# SNAP: We had to disable this as currently snapd doesn't allow us to
+# specify a snap-declaration with two slots using the dbus interface.
+# (see LP #xxx for details)
+#
+# CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS=n
 
 # Add support for new DBus control interface
 # (fi.w1.hostap.wpa_supplicant1)