connman has nfsroot support built in since version 1.34 [1], so the
nfsroot handling in the init script is redundant.

[1] 
https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=ef0d26e6ef2b883193469f016117d8238c1c9658

Signed-off-by: Tom Hochstein <tom.hochst...@nxp.com>
---
 .../connman/connman/connman                   | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman/connman 
b/meta/recipes-connectivity/connman/connman/connman
index 310a696863..a021fd4655 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -10,48 +10,11 @@ fi
 
 set -e
 
-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
-
 do_start() {
-       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="$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="$EXTRA_PARAM -I $i"
-                           break
-                       fi
-                   done
-               fi
-           fi
-       fi
        if [ -f @DATADIR@/connman/wired-setup ] ; then
                . @DATADIR@/connman/wired-setup
        fi
-       $DAEMON $EXTRA_PARAM
+       $DAEMON
 }
 
 do_stop() {
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170425): 
https://lists.openembedded.org/g/openembedded-core/message/170425
Mute This Topic: https://lists.openembedded.org/mt/93531638/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to