connman: Try to figure out NFS root interface if using DHCP
The commit c734873022
missed the case
where the NFS is using DHCP.
[YOCTO #5176]
(From OE-Core rev: 29be8e79a200d33555d2887578975e33b8417795)
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
06078af4ca
commit
42ef04b364
|
@ -30,16 +30,23 @@ do_start() {
|
||||||
EXTRA_PARAM=""
|
EXTRA_PARAM=""
|
||||||
if test $nfsroot -eq 1 ; then
|
if test $nfsroot -eq 1 ; then
|
||||||
NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
|
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'`
|
NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'`
|
||||||
|
|
||||||
if [ x$NET_ADDR != x ]; then
|
if [ ! -z "$NET_ADDR" ]; then
|
||||||
for i in $NET_DEVS; do
|
if [ "$NET_ADDR" = dhcp ]; then
|
||||||
ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'`
|
ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
|
||||||
if [ "$NET_ADDR" = "$ADDR" ]; then
|
if [ ! -z "$ethn" ]; then
|
||||||
EXTRA_PARAM="-I $i"
|
EXTRA_PARAM="-I $ethn"
|
||||||
break
|
|
||||||
fi
|
fi
|
||||||
done
|
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
|
||||||
fi
|
fi
|
||||||
if [ -f @LIBDIR@/connman/wired-setup ] ; then
|
if [ -f @LIBDIR@/connman/wired-setup ] ; then
|
||||||
|
|
Loading…
Reference in New Issue