connman-conf: do nothing in qemu, do not touch eth0

qemu kernel itself is nowdays perfectly capable of setting up
what was passed in via ip=:

    [    1.676847] IP-Config: Complete:
    [    1.677768]      device=eth0, hwaddr=52:54:00:12:34:02, ipaddr=192.168.7.2, mask=255.255.255.0, gw=192.168.7.1
    [    1.679933]      host=192.168.7.2, domain=, nis-domain=(none)
    [    1.681201]      bootserver=255.255.255.255, rootserver=255.255.255.255, rootpath=
    [    1.681203]      nameserver0=8.8.8.8

connman-conf only does the same thing again by (badly and incompletely)
parsing those parameters with sed.

(From OE-Core rev: 3c25b89720417a7b1963f0a32c870208a5803950)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index c64fa0d715..310a696863 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -27,7 +27,6 @@ while read dev mtpt fstype rest; do
 done
 
 do_start() {
-        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'`
@@ -36,13 +35,13 @@ do_start() {
                 if [ "$NET_ADDR" = dhcp ]; then
                     ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
                     if [ ! -z "$ethn" ]; then
-                        EXTRA_PARAM="-I $ethn"
+                        EXTRA_PARAM="$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"
+                            EXTRA_PARAM="$EXTRA_PARAM -I $i"
                             break
                         fi
                     done