From: Adrian Freihofer <adrian.freihofer@gmail.com>
Date: Thu, 22 Jun 2023 17:01:21 +0000 (+0200)
Subject: runqemu-ifup: remove uid parameter
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~554
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ccbabc06d02addd429a21dbe15a1a42738c58d6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

runqemu-ifup: remove uid parameter

ip tuntap does not need the uid, it was an unused variable/parameter.
Backward compatibility should be fine.

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index 5dc765dee82..26714518020 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -21,7 +21,7 @@
 #
 
 usage() {
-	echo "sudo $(basename $0) <uid> <gid>"
+	echo "sudo $(basename $0) <gid>"
 }
 
 if [ $EUID -ne 0 ]; then
@@ -29,17 +29,20 @@ if [ $EUID -ne 0 ]; then
 	exit 1
 fi
 
-if [ $# -ne 2 ]; then
+if [ $# -eq 2 ]; then
+	echo "Warning: uid parameter is ignored. It is no longer needed."
+	GROUP="$2"
+elif [ $# -eq 1 ]; then
+	GROUP="$1"
+else
 	usage
 	exit 1
 fi
 
-USERID="-u $1"
-GROUP="-g $2"
 
 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 $2 && TAP=tap$tap_no
+	ip tuntap add tap$tap_no mode tap group "$GROUP" && TAP=tap$tap_no
 fi
 
 if [ -z $TAP ]; then