Rename to system.virt

Run systemd-detect-virt first.

Author: vstinner

Lib/test/pythoninfo.py

@@ -1129,10 +1129,14 @@ def get_machine_id():
     return None
 
 
-def is_running_in_container():
+def detect_virt():
+    # Run systemd-detect-virt command
+    virt = run_command(["systemd-detect-virt"])
+    if virt and virt != "none":
+        return virt
+
     # Check if the process in running in a container
     import os.path
-
     if os.path.exists('/.dockerenv'):
         return 'docker'
     if os.path.exists('/run/.containerenv'):
@@ -1142,11 +1146,6 @@ def is_running_in_container():
     if container:
         return container
 
-    # Run systemd-detect-virt command
-    container = run_command(["systemd-detect-virt"])
-    if container and container != "none":
-        return container
-
     # Other ways to check if running in a container:
     # * Parse /proc/1/mounts or /proc/1/mountinfo (check "/" filesystem).
     # * Parse /proc/1/cgroup.
@@ -1183,9 +1182,9 @@ def collect_system(info_add):
             uptime = f'{uptime} sec'
         info_add('system.uptime', uptime)
 
-    container = is_running_in_container()
-    if container:
-        info_add('system.in_container', container)
+    virt = detect_virt()
+    if virt:
+        info_add('system.virt', virt)
 
 
 def collect_info(info):