From ec5530779df23ea25729c7d19c664c05fae5758d Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 1 Apr 2013 18:54:37 +0300 Subject: connman: added wired setup for systemd Added support for correctly configuring wired interface if systemd is the init system. Fixes [YOCTO #4041]. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/connman/connman.inc') diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 96ebc551b8..5d35bc2185 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r0" +INC_PR = "r1" TIST = "--enable-tist" TIST_powerpc = "" @@ -47,6 +47,7 @@ INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." SYSTEMD_SERVICE_${PN} = "connman.service" +SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup" # IMPORTANT: because xuser is shared with rootless X, please make sure the # USERADD_PARAM is in sync with the one in xserver-nodm-init.bb @@ -57,6 +58,10 @@ USERADD_PARAM_${PN} = "--create-home \ inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd +do_configure_append () { + sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service +} + # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. -- cgit 1.2.3-korg