From: Roy Li <rongqing...@windriver.com>
Otherwise system will hang since nfs is not disconnected
and remove the judgement of initscript DISTRO_FEATURE when install init
script connman, because inherit systemd will remove init script
Signed-off-by: Roy Li <rongqing...@windriver.com>
---
meta/recipes-connectivity/connman/connman.inc | 13 +++---
.../connman/connman/connman-nfs | 42 ++++++++++++++++++++
meta/recipes-connectivity/connman/connman_1.17.bb | 1 +
3 files changed, 51 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/connman-nfs
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index 37ce3ec..f168d89 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -72,7 +72,7 @@ inherit autotools gtk-doc pkgconfig systemd update-rc.d
do_configure_append () {
sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#"
${S}/src/connman.service
-
+ sed -i "s#ExecStart=.*#ExecStart=${bindir}/connman-nfs#"
${S}/src/connman.service
}
# This allows *everyone* to access ConnMan over DBus, without any access
@@ -84,10 +84,13 @@ do_compile_append() {
}
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
+ 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
+
+ if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${bindir}/
+ install -m 0755 ${WORKDIR}/connman-nfs ${D}${bindir}/
fi
install -d ${D}${bindir}
diff --git a/meta/recipes-connectivity/connman/connman/connman-nfs
b/meta/recipes-connectivity/connman/connman/connman-nfs
new file mode 100644
index 0000000..1058787
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/connman-nfs
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+nfsroot=0
+
+exec 9<&0 < /proc/mounts
+while read dev mtpt fstype rest; do
+ if test $mtpt = "/" ; then
+ case $fstype in
+ nfs | nfs4)
+ nfsroot=1
+ break
+ ;;
+ *)
+ ;;
+ esac
+ fi
+done
+
+EXTRA_PARAM=""
+if test $nfsroot -eq 1 ; then
+ NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
+ NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'`
+
+ if [ ! -z "$NET_ADDR" ]; then
+ if [ "$NET_ADDR" = dhcp ]; then
+ ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
+ if [ ! -z "$ethn" ]; then
+ EXTRA_PARAM="-I $ethn"
+ fi
+ else
+ for i in $NET_DEVS; do
+ ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet
\([0-9.]*\) .*$/\1/p'`
+ if [ "$NET_ADDR" = "$ADDR" ]; then
+ EXTRA_PARAM="-I $i"
+ break
+ fi
+ done
+ fi
+ fi
+fi
+
+/usr/sbin/connmand -n $EXTRA_PARAM
diff --git a/meta/recipes-connectivity/connman/connman_1.17.bb
b/meta/recipes-connectivity/connman/connman_1.17.bb
index 461157f..4577416 100644
--- a/meta/recipes-connectivity/connman/connman_1.17.bb
+++ b/meta/recipes-connectivity/connman/connman_1.17.bb
@@ -4,6 +4,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://add_xuser_dbus_permission.patch \
file://connman \
+ file://connman-nfs \
"
SRC_URI[md5sum] = "dd4a13f789de1b69fcddf0cf613f2d5b"
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
