runqemu: Replace use of ifconfig with ip
ifconfig and its ilk (net-tools package) is deprecated in favour of iproute2 package and is now removed by many distro's e.g. Archlinux. So we replace ifconfig with ip utility (From OE-Core rev: c19e5d19ae8e6e6eb9b37549d80765b8315f79a4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f259554b4e
commit
4520feca65
|
@ -59,10 +59,10 @@ if [ ! -x "$RUNQEMU_IFUP" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IFCONFIG=`which ifconfig 2> /dev/null`
|
IFCONFIG=`which ip 2> /dev/null`
|
||||||
if [ -z "$IFCONFIG" ]; then
|
if [ -z "$IFCONFIG" ]; then
|
||||||
# Is it ever anywhere else?
|
# Is it ever anywhere else?
|
||||||
IFCONFIG=/sbin/ifconfig
|
IFCONFIG=/sbin/ip
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$IFCONFIG" ]; then
|
if [ ! -x "$IFCONFIG" ]; then
|
||||||
echo "$IFCONFIG cannot be executed"
|
echo "$IFCONFIG cannot be executed"
|
||||||
|
@ -70,7 +70,7 @@ if [ ! -x "$IFCONFIG" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure we start with a clean slate
|
# Ensure we start with a clean slate
|
||||||
for tap in `$IFCONFIG | grep ^tap | awk '{ print \$1 }' | sed s/://`; do
|
for tap in `$IFCONFIG link | grep tap | awk '{ print \$2 }' | sed s/://`; do
|
||||||
echo "Note: Destroying pre-existing tap interface $tap..."
|
echo "Note: Destroying pre-existing tap interface $tap..."
|
||||||
$TUNCTL -d $tap
|
$TUNCTL -d $tap
|
||||||
done
|
done
|
||||||
|
|
|
@ -70,10 +70,10 @@ if [ $STATUS -ne 0 ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IFCONFIG=`which ifconfig 2> /dev/null`
|
IFCONFIG=`which ip 2> /dev/null`
|
||||||
if [ "x$IFCONFIG" = "x" ]; then
|
if [ "x$IFCONFIG" = "x" ]; then
|
||||||
# better than nothing...
|
# better than nothing...
|
||||||
IFCONFIG=/sbin/ifconfig
|
IFCONFIG=/sbin/ip
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$IFCONFIG" ]; then
|
if [ ! -x "$IFCONFIG" ]; then
|
||||||
echo "$IFCONFIG cannot be executed"
|
echo "$IFCONFIG cannot be executed"
|
||||||
|
@ -100,7 +100,7 @@ if [ ! -x "$IPTABLES" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
|
n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
|
||||||
$IFCONFIG $TAP 192.168.7.$n netmask 255.255.255.255
|
$IFCONFIG addr add 192.168.7.$n/32 dev $TAP
|
||||||
|
|
||||||
dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
|
dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
|
||||||
$ROUTE add -host 192.168.7.$dest $TAP
|
$ROUTE add -host 192.168.7.$dest $TAP
|
||||||
|
|
|
@ -139,16 +139,16 @@ if [ ! -d "$LOCKDIR" ]; then
|
||||||
chmod 777 $LOCKDIR
|
chmod 777 $LOCKDIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IFCONFIG=`which ifconfig 2> /dev/null`
|
IFCONFIG=`which ip 2> /dev/null`
|
||||||
if [ -z "$IFCONFIG" ]; then
|
if [ -z "$IFCONFIG" ]; then
|
||||||
IFCONFIG=/sbin/ifconfig
|
IFCONFIG=/sbin/ip
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$IFCONFIG" ]; then
|
if [ ! -x "$IFCONFIG" ]; then
|
||||||
echo "$IFCONFIG cannot be executed"
|
echo "$IFCONFIG cannot be executed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
POSSIBLE=`$IFCONFIG -a | grep '^tap' | awk '{print $1}' | sed s/://`
|
POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
|
||||||
TAP=""
|
TAP=""
|
||||||
LOCKFILE=""
|
LOCKFILE=""
|
||||||
for tap in $POSSIBLE; do
|
for tap in $POSSIBLE; do
|
||||||
|
|
Loading…
Reference in New Issue