vng: pass '--user root' to virtme-run

But don't set virtme_user to root in virtme-run. By doing that, it is possible, it is possible to use '--user' in other context, e.g. with '--vsock-connect' Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
arighi · Dec 6, 2024 · e4651aa · e4651aa
1 parent 43aff7c
commit e4651aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/virtme/commands/run.py b/virtme/commands/run.py
@@ -1498,7 +1498,7 @@ def cleanup_vsock_script():
             return 1
         kernelargs.append("virtme_chdir=%s" % rel_cwd)
 
-    if args.user:
+    if args.user and args.user != "root":
         kernelargs.append("virtme_user=%s" % args.user)
 
     if args.nvgpu:

diff --git a/virtme_ng/run.py b/virtme_ng/run.py
@@ -852,16 +852,14 @@ def _get_virtme_user(self, args):
         # sessions is current user.
         #
         # NOTE: graphic sessions are considered interactive.
+        self.virtme_param["user"] = ""
         if args.exec and not args.graphics:
             self.virtme_param["user"] = ""
         else:
             self.virtme_param["user"] = "--user " + get_username()
         # Override default user, if specified by the --user argument.
         if args.user is not None:
-            if args.user != "root":
-                self.virtme_param["user"] = "--user " + args.user
-            else:
-                self.virtme_param["user"] = ""
+            self.virtme_param["user"] = "--user " + args.user
 
     def _get_virtme_arch(self, args):
         if args.arch is not None: