diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2023-06-22 19:01:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-24 12:21:48 +0100 |
commit | 2d0913ff6f6c4cbab2e293cc05c2de322e2ef090 (patch) | |
tree | 37fc77b8a9cbd7d9922d486ac9339bbe5b313ef9 /scripts | |
parent | a1f72258843746e30cede172ba2013eba0ccd3fe (diff) | |
download | poky-2d0913ff6f6c4cbab2e293cc05c2de322e2ef090.tar.gz |
runqemu-ifup: remove uid parameter
ip tuntap does not need the uid, it was an unused variable/parameter.
Backward compatibility should be fine.
(From OE-Core rev: 9ccbabc06d02addd429a21dbe15a1a42738c58d6)
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/runqemu-ifup | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 5dc765dee8..2671451802 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup | |||
@@ -21,7 +21,7 @@ | |||
21 | # | 21 | # |
22 | 22 | ||
23 | usage() { | 23 | usage() { |
24 | echo "sudo $(basename $0) <uid> <gid>" | 24 | echo "sudo $(basename $0) <gid>" |
25 | } | 25 | } |
26 | 26 | ||
27 | if [ $EUID -ne 0 ]; then | 27 | if [ $EUID -ne 0 ]; then |
@@ -29,17 +29,20 @@ if [ $EUID -ne 0 ]; then | |||
29 | exit 1 | 29 | exit 1 |
30 | fi | 30 | fi |
31 | 31 | ||
32 | if [ $# -ne 2 ]; then | 32 | if [ $# -eq 2 ]; then |
33 | echo "Warning: uid parameter is ignored. It is no longer needed." | ||
34 | GROUP="$2" | ||
35 | elif [ $# -eq 1 ]; then | ||
36 | GROUP="$1" | ||
37 | else | ||
33 | usage | 38 | usage |
34 | exit 1 | 39 | exit 1 |
35 | fi | 40 | fi |
36 | 41 | ||
37 | USERID="-u $1" | ||
38 | GROUP="-g $2" | ||
39 | 42 | ||
40 | if taps=$(ip tuntap list 2>/dev/null); then | 43 | if taps=$(ip tuntap list 2>/dev/null); then |
41 | tap_no=$(( $(echo "$taps" |cut -f 1 -d ":" | sed 's/tap//g' | sort -rn | head -n 1) + 1 )) | 44 | tap_no=$(( $(echo "$taps" |cut -f 1 -d ":" | sed 's/tap//g' | sort -rn | head -n 1) + 1 )) |
42 | ip tuntap add tap$tap_no mode tap group $2 && TAP=tap$tap_no | 45 | ip tuntap add tap$tap_no mode tap group "$GROUP" && TAP=tap$tap_no |
43 | fi | 46 | fi |
44 | 47 | ||
45 | if [ -z $TAP ]; then | 48 | if [ -z $TAP ]; then |