From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 28 May 2024 12:37:59 +0000 (+0200)
Subject: Fix scope_env()
X-Git-Tag: v23.1~44^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55915ddbf773f46717165eea7bc155781bb86205;p=thirdparty%2Fmkosi.git

Fix scope_env()

DBUS_SYSTEM_ADDRESS isn't always set so make sure to check for the
canonical location of the system bus socket as well.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 6855d9844..2653c496c 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -701,8 +701,13 @@ def scope_env() -> dict[str, str]:
             "DBUS_SESSION_BUS_ADDRESS": os.environ["DBUS_SESSION_BUS_ADDRESS"],
             "XDG_RUNTIME_DIR": os.environ["XDG_RUNTIME_DIR"]
         }
-    elif os.getuid() == 0 and "DBUS_SYSTEM_ADDRESS" in os.environ:
-        return {"DBUS_SYSTEM_ADDRESS" : os.environ["DBUS_SYSTEM_ADDRESS"]}
+    elif os.getuid() == 0:
+        if "DBUS_SYSTEM_ADDRESS" in os.environ:
+            return {"DBUS_SYSTEM_ADDRESS": os.environ["DBUS_SYSTEM_ADDRESS"]}
+        elif Path("/run/dbus/system_bus_socket").exists():
+            return {"DBUS_SYSTEM_ADDRESS": "/run/dbus/system_bus_socket"}
+        else:
+            return {}
     else:
         return {}