Merge pull request #27806 from DaanDeMeyer/fix-mkosi-check

mkosi: Use proper check to detect whether we're in a VM

2 files changed, 9 insertions, 1 deletions

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 484b610a02..1fe4153abc 100755
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -52,7 +52,9 @@ class SysvGeneratorTest(unittest.TestCase):
         parsed generated units.
         '''
         env = os.environ.copy()
-        env['SYSTEMD_LOG_LEVEL'] = 'debug'
+        # We might debug log about errors that aren't actually fatal so let's bump the log level to info to
+        # prevent those logs from interfering with the test.
+        env['SYSTEMD_LOG_LEVEL'] = 'info'
         env['SYSTEMD_LOG_TARGET'] = 'console'
         env['SYSTEMD_SYSVINIT_PATH'] = self.init_d_dir
         env['SYSTEMD_SYSVRCND_PATH'] = self.rcnd_dir
diff --git a/test/test-udev.py b/test/test-udev.py
index 7e9afc4fc8..710aaed3a9 100755
--- a/test/test-udev.py
+++ b/test/test-udev.py
@@ -2346,6 +2346,12 @@ def environment_issue():
                        check=False)
     if c.returncode == 0:
         return 'Running in a chroot, skipping the test'
+
+    c = subprocess.run(['systemd-detect-virt', '-c', '-q'],
+                       check=False)
+    if c.returncode == 0:
+        return 'Running in a container, skipping the test'
+
     return None