From 2401847d7333b1cf1ca5a7ed05a84bfec2f16b67 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Thu, 22 Jun 2023 19:01:22 +0200 Subject: runqemu-ifup: configurable tap names Feature: Hard-coding the interface names to tap* is not always a good idea. Introduce an environment variable which allows to change this: OE_TAP_NAME. (From OE-Core rev: c9ea17c13935e805a5b7497b14e1f049b0548779) Signed-off-by: Adrian Freihofer Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- scripts/runqemu-ifup | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'scripts/runqemu-ifup') diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 2671451802..9820dc535c 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -40,12 +40,16 @@ else fi +if [ -z "$OE_TAP_NAME" ]; then + OE_TAP_NAME=tap +fi + if taps=$(ip tuntap list 2>/dev/null); then - tap_no=$(( $(echo "$taps" |cut -f 1 -d ":" | sed 's/tap//g' | sort -rn | head -n 1) + 1 )) - ip tuntap add tap$tap_no mode tap group "$GROUP" && TAP=tap$tap_no + tap_no=$(( $(echo "$taps" |cut -f 1 -d ":" | sed "s/$OE_TAP_NAME//g" | sort -rn | head -n 1) + 1 )) + ip tuntap add "$OE_TAP_NAME$tap_no" mode tap group "$GROUP" && TAP="$OE_TAP_NAME$tap_no" fi -if [ -z $TAP ]; then +if [ -z "$TAP" ]; then echo "Error: Unable to find a tap device to use" exit 1 fi @@ -69,7 +73,7 @@ if [ ! -x "$IPTABLES" ]; then exit 1 fi -n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] +n=$[ (`echo $TAP | sed "s/$OE_TAP_NAME//"` * 2) + 1 ] $IPTOOL addr add 192.168.7.$n/32 broadcast 192.168.7.255 dev $TAP STATUS=$? if [ $STATUS -ne 0 ]; then @@ -83,7 +87,7 @@ if [ $STATUS -ne 0 ]; then exit 1 fi -dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] +dest=$[ (`echo $TAP | sed "s/$OE_TAP_NAME//"` * 2) + 2 ] $IPTOOL route add to 192.168.7.$dest dev $TAP STATUS=$? if [ $STATUS -ne 0 ]; then -- cgit v1.2.3-54-g00ecf