[oe-commits] [openembedded-core] 58/60: runqemu-ifdown: ensure to clean up TAP

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 322e41de7f4fb21315bf75f1038314c31ac4754b
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Thu Jun 7 15:52:47 2018 +0800

    runqemu-ifdown: ensure to clean up TAP
    
    In runqemu-ifup, ip command is used to add TAP; in runqemu-ifdown,
    we should do the reversed logic, using ip command to delete TAP, to
    make sure TAP is cleaned up by ourselves.
    
    I can see that in runqemu-ifdown script, 'tunctl -d' and 'iptables'
    commands are used to deal with TAP, but these two commands cannot
    make sure that the TAP is cleaned up.
    
    runqemu-ifup uses 'ip' to set up TAP, we really need to do the opposite
    in runqemu-ifdown.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/runqemu-ifdown | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown
index ffbc9de..2486968 100755
--- a/scripts/runqemu-ifdown
+++ b/scripts/runqemu-ifdown
@@ -51,6 +51,16 @@ fi
 
 $TUNCTL -d $TAP
 
+IFCONFIG=`which ip 2> /dev/null`
+if [ "x$IFCONFIG" = "x" ]; then
+	# better than nothing...
+	IFCONFIG=/sbin/ip
+fi
+if [ -x "$IFCONFIG" ]; then
+	if `$IFCONFIG link show $TAP > /dev/null 2>&1`; then
+		$IFCONFIG link del $TAP
+	fi
+fi
 # cleanup the remaining iptables rules
 IPTABLES=`which iptables 2> /dev/null`
 if [ "x$IPTABLES" = "x" ]; then

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.