mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
runqemu-ifupdown/get-tapdevs: Add support for ip tuntap
The *ip* command supports the creation and destruction of TAP devices since 2009 and might be more likely installed on systems then *tunctl*. Therefore it should be tried to setup or teardown the TAP interface with *ip* before falling back to *tunctl*. https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=580fbd88f75cc9eea0d28a48c025b090eb9419a7 (From OE-Core rev: 424ede206baae1c228583aab1df6c18513ac104f) Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
177886950e
commit
d43c41fcaf
@@ -50,12 +50,6 @@ if ! [ $COUNT -ge 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TUNCTL=$STAGING_BINDIR_NATIVE/tunctl
|
||||
if [[ ! -x "$TUNCTL" || -d "$TUNCTL" ]]; then
|
||||
echo "Error: $TUNCTL is not an executable"
|
||||
usage
|
||||
fi
|
||||
|
||||
if [ $EUID -ne 0 ]; then
|
||||
echo "Error: This script must be run with root privileges"
|
||||
exit
|
||||
@@ -68,15 +62,29 @@ if [ ! -x "$RUNQEMU_IFUP" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! interfaces=`ip link` 2>/dev/null; then
|
||||
TUNCTL=$STAGING_BINDIR_NATIVE/tunctl
|
||||
ip_supports_tuntap=false
|
||||
if interfaces=`ip tuntap list` 2>/dev/null; then
|
||||
ip_supports_tuntap=true
|
||||
interfaces=`echo "$interfaces |cut -f1 -d:`
|
||||
elif [[ ! -x "$TUNCTL" || -d "$TUNCTL" ]]; then
|
||||
echo "Error: $TUNCTL is not an executable"
|
||||
usage
|
||||
elif interfaces=`ip link` 2>/dev/null; then
|
||||
interfaces=`echo "$interfaces" | sed '/^[0-9]\+: \(docker[0-9]\+\):.*/!d; s//\1/'`
|
||||
else
|
||||
echo "Failed to call 'ip link'" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Ensure we start with a clean slate
|
||||
for tap in `echo "$interfaces" | sed '/^[0-9]\+: \(docker[0-9]\+\):.*/!d; s//\1/'`; do
|
||||
for tap in $interfaces; do
|
||||
echo "Note: Destroying pre-existing tap interface $tap..."
|
||||
$TUNCTL -d $tap
|
||||
if $ip_supports_tuntap; then
|
||||
ip tuntap del $tap mode tap
|
||||
else
|
||||
$TUNCTL -d $tap
|
||||
fi
|
||||
done
|
||||
rm -f /etc/runqemu-nosudo
|
||||
|
||||
|
||||
Reference in New Issue
Block a user