runqemu-internal: don't bring down preconfigured tap interface
runqemu-ifup and runqemu-ifdown should be pairs. If we're using a preconfigured tap interface, the runqemu-ifdown should not be invoked to bring it down. (From OE-Core rev: f60f215f74b5fe5a43943c9d3ccdbe0fa06b7828) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8f32af94c0
commit
a78bf1ce7b
|
@ -175,12 +175,14 @@ else
|
||||||
POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
|
POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
|
||||||
TAP=""
|
TAP=""
|
||||||
LOCKFILE=""
|
LOCKFILE=""
|
||||||
|
USE_PRECONF_TAP="no"
|
||||||
for tap in $POSSIBLE; do
|
for tap in $POSSIBLE; do
|
||||||
LOCKFILE="$LOCKDIR/$tap"
|
LOCKFILE="$LOCKDIR/$tap"
|
||||||
echo "Acquiring lockfile for $tap..."
|
echo "Acquiring lockfile for $tap..."
|
||||||
acquire_lock $LOCKFILE
|
acquire_lock $LOCKFILE
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
TAP=$tap
|
TAP=$tap
|
||||||
|
USE_PRECONF_TAP="yes"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -215,7 +217,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
if [ ! -e "$NOSUDO_FLAG" ]; then
|
if [ ! -e "$NOSUDO_FLAG" -a "$USE_PRECONF_TAP" = "no" ]; then
|
||||||
# Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded
|
# Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded
|
||||||
# but inactive. This looks scary but is harmless
|
# but inactive. This looks scary but is harmless
|
||||||
sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2> /dev/null
|
sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2> /dev/null
|
||||||
|
|
Loading…
Reference in New Issue