connman: just give xuser the extra rights it needs

1 files changed, 5 insertions, 9 deletions

diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
index aa7a910eb7..707b3cafba 100644
--- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
@@ -1,24 +1,20 @@
-Some platform (like atom-pc) enables rootless X,
-thus we need to add the xuser in the list.
+Because Poky doesn't support at_console we need to special-case the session
+user.
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
-index 98a773e..cbe2ba3 100644
+index 98a773e..466809c 100644
 --- a/src/connman-dbus.conf
 +++ b/src/connman-dbus.conf
-@@ -8,6 +8,13 @@
+@@ -8,6 +8,9 @@
          <allow send_interface="net.connman.Counter"/>
          <allow send_interface="net.connman.Notification"/>
      </policy>
 +    <policy user="xuser">
-+        <allow own="net.connman"/>
 +        <allow send_destination="net.connman"/>
-+        <allow send_interface="net.connman.Agent"/>
-+        <allow send_interface="net.connman.Counter"/>
-+        <allow send_interface="net.connman.Notification"/>
 +    </policy>
      <policy at_console="true">
          <allow send_destination="net.connman"/>