mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

connman: Drop redundant nfsroot handling

Browse Source 
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

(From OE-Core rev: 1aee9ea3feaef7a1832416954a4af07868be047b)

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Hochstein
2022-09-07 13:38:33 -05:00
committed by Richard Purdie
parent 2d3394527c
commit b8baa464f0
1 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-connectivity/connman/connman/connman
View File

@@ -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() {