diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-09-06 10:23:00 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-06 23:01:50 +0100 |
| commit | 1838671b832015ae28c8c101e8b20afbbf4b3c98 (patch) | |
| tree | 52db6015b3721affd8fed43359d40ea85d57bd0b | |
| parent | a04f4fe8db425f0ea87a67b5c72d61816b8d53e2 (diff) | |
| download | openembedded-core-1838671b832015ae28c8c101e8b20afbbf4b3c98.tar.gz openembedded-core-1838671b832015ae28c8c101e8b20afbbf4b3c98.tar.bz2 openembedded-core-1838671b832015ae28c8c101e8b20afbbf4b3c98.zip | |
connman: Ignore the NFS root network interface in init script
The connman init.d script tried to ignore all the network interfaces
if NFS root is configured. We should only ignore the interface
that is used by NFS root.
[YOCTO #4587]
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/connman | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman index 67ba7c8a2a..2625adeead 100644 --- a/meta/recipes-connectivity/connman/connman/connman +++ b/meta/recipes-connectivity/connman/connman/connman @@ -29,8 +29,18 @@ done do_start() { EXTRA_PARAM="" if test $nfsroot -eq 1 ; then - ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` - EXTRA_PARAM="-I $ethn" + 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 [ x$NET_ADDR != x ]; then + 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 if [ -f @LIBDIR@/connman/wired-setup ] ; then . @LIBDIR@/connman/wired-setup |