From b97fe9d3e7dce1ee625aa1c1d37d004e93d35ddb Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Thu, 22 Jun 2023 19:01:23 +0200 Subject: runqemu-ifup: fix tap index Recent patches changed the index of the tap interfaces. They start now with tap1 instead of tap0. Also the IP address starts with 192.168.7.3 instead of 192.168.7.1. This gets reverted to the previous behavior. (From OE-Core rev: eaf9d2dfd8f0270f543b612fbd2df775adc7a394) Signed-off-by: Adrian Freihofer Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- scripts/runqemu-ifup | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts/runqemu-ifup') diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 9820dc535c..fe4492e78b 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -45,8 +45,13 @@ if [ -z "$OE_TAP_NAME" ]; then fi if taps=$(ip tuntap list 2>/dev/null); then - 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" + tap_no_last=$(echo "$taps" |cut -f 1 -d ":" |sed "s/$OE_TAP_NAME//g" | sort -rn | head -n 1) + if [ -z "$tap_no_last" ]; then + tap_no=0 + else + tap_no=$(("$tap_no_last" + 1)) + fi + ip tuntap add "$OE_TAP_NAME$tap_no" mode tap group "$GROUP" && TAP=$OE_TAP_NAME$tap_no fi if [ -z "$TAP" ]; then -- cgit v1.2.3-54-g00ecf