diff mbox series

[2/4] runqemu: Fix automated call to runqemu-ifup

Message ID 20230626133213.47920-3-adrian.freihofer@siemens.com
State Accepted, archived
Commit ce3a2f4cec28290c8e530989f17243f1ada4e3bd
Headers show
Series fix runqemu-ifup/down scritps | expand

Commit Message

Adrian Freihofer June 26, 2023, 1:29 p.m. UTC 
From: Alejandro Hernandez Samaniego <alejandro@enedino.org>

When runqemu tries to call runqemu-ifup to create tap devices, it checks the
output of runqemu-ifup to get the newly created tap device.

The behavior of runqemu-ifup was recently modified along with its output, it
no longer expects the uid parameter to be passed and it prints out a warning
if it was, since this warning was now part of the output runqemu tries to parse
it and convert it to an int() which proved impossible.

Pass the correct arguments to the runqemu-ifup call and echo the warning
to stderr instead to make sure its not being parsed and used by runqemu in any
case.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
---
 scripts/runqemu      | 2 +-
 scripts/runqemu-ifup | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 3f187ca793c..6a3fbb2d6fe 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1186,7 +1186,7 @@  to your build configuration.
             gid = os.getgid()
             uid = os.getuid()
             logger.info("Setting up tap interface under sudo")
-            cmd = ('sudo', self.qemuifup, str(uid), str(gid))
+            cmd = ('sudo', self.qemuifup, str(gid))
             try:
                 tap = subprocess.check_output(cmd).decode('utf-8').strip()
             except subprocess.CalledProcessError as e:
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index c65ceaf1c83..05c9325b6bd 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -30,7 +30,7 @@  if [ $EUID -ne 0 ]; then
 fi
 
 if [ $# -eq 2 ]; then
-	echo "Warning: uid parameter is ignored. It is no longer needed."
+	echo "Warning: uid parameter is ignored. It is no longer needed." >&2
 	GROUP="$2"
 elif [ $# -eq 1 ]; then
 	GROUP="$1"