connman: replace hardcoded path in init script and systemd service
The connman init script sources a setup file from /usr/lib/connman, so we end up with no network in qemu multilib enabled images. The init script it's installed by connman and because wired-setup it's installed by another package (connman-conf) we can't use libexecdir here and now (in the init script and systemd service file). Once libexecdir changes from ${libdir}/${bpn} to something else like /usr/libexec we could use that instead of ${libdir}/connman. Changed in v2: - better commit message [YOCTO #4493] (From OE-Core rev: fca3a884e9cae13a521d840838eee3c01f0b6acf) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ec89446cb4
commit
e3a5e8e652
|
@ -56,7 +56,7 @@ INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
|
|||
|
||||
SYSTEMD_SERVICE_${PN} = "connman.service"
|
||||
SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
|
||||
SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup"
|
||||
SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/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
|
||||
|
@ -69,6 +69,7 @@ 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
|
||||
|
@ -83,6 +84,7 @@ do_install_append() {
|
|||
if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
|
||||
sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman
|
||||
fi
|
||||
|
||||
install -d ${D}${bindir}
|
||||
|
|
|
@ -32,8 +32,8 @@ do_start() {
|
|||
ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
|
||||
EXTRA_PARAM="-I $ethn"
|
||||
fi
|
||||
if [ -f /usr/lib/connman/wired-setup ] ; then
|
||||
. /usr/lib/connman/wired-setup
|
||||
if [ -f @LIBDIR@/connman/wired-setup ] ; then
|
||||
. @LIBDIR@/connman/wired-setup
|
||||
fi
|
||||
$DAEMON $EXTRA_PARAM
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue