Skip to contentSkip to conversation

test-runner: remove root user requirement from log/monitor/result

PATCH Superseded James Prestwood 1 participant 1 message Apr 21, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH 1/1 test-runner: remove root user requirement from log/monitor/result

Certain aspects of QEMU like mounting host directories may still require root access but for UML this is not the case. To handle both cases first check if SUDO_UID/GID are set and use those to obtain the actual users ID's. Otherwise if running as non-root use the UID/GID of the user directly.

---
 tools/runner.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
tools/runner.py +2 -16
index 1739b786..7c177f1f 100644
@@ -305,18 +305,12 @@ class RunnerAbstract:
 
 	# For QEMU/UML --log, --monitor, --result
 	def _prepare_outfiles(self):
-		gid = None
 		append_gid_uid = False
 
-		if os.environ.get('SUDO_GID', None):
-			uid = int(os.environ['SUDO_UID'])
-			gid = int(os.environ['SUDO_GID'])
+		uid = int(os.environ.get('SUDO_UID', os.getuid()))
+		gid = int(os.environ.get('SUDO_GID', os.getgid()))
 
 		if self.args.log:
-			if os.getuid() != 0:
-				print("--log can only be used as root user")
-				quit()
-
 			append_gid_uid = True
 
 			if not os.path.exists(self.args.log):
@@ -326,20 +320,12 @@ class RunnerAbstract:
 				os.chown(self.args.log, uid, gid)
 
 		if self.args.monitor:
-			if os.getuid() != 0:
-				print("--monitor can only be used as root user")
-				quit()
-
 			append_gid_uid = True
 
 			self.args.monitor_parent = os.path.abspath(
 						os.path.join(self.args.monitor, os.pardir))
 
 		if self.args.result:
-			if os.getuid() != 0:
-				print("--result can only be used as root user")
-				quit()
-
 			append_gid_uid = True
 
 			self.args.result_parent = os.path.abspath(
Signature · 1 line
2.34.1