Changeset 99478 in vbox

Timestamp:

Apr 20, 2023 8:22:45 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156971

Message:

Check if XDG_SESSION_TYPE is set to tty, else GUI refuses to start in ssh sessions.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -7875 +7875 @@
   ifeq ($(KBUILD_TARGET),linux)
    TEMPLATE_VBoxQtGuiExe_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-rpath,$(PATH_SDK_QT5_LIB)
    TEMPLATE_VBoxQtGuiExe_LIBS += \
         $(VBOX_XCURSOR_LIBS) \

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

@@ -740 +740 @@
 DisplayServerType NativeWindowSubsystem::detectDisplayServerType()
 {
+    /* Warning: All the following assumes:
+         - the system does not have several sessions with different display server configurations,
+         - XDG_SESSION_TYPE is set accordingly.
+    */
     const char *pSessionType = RTEnvGet("XDG_SESSION_TYPE");
     if (pSessionType != NULL)
@@ -752 +756 @@
         else if (RTStrIStr(pSessionType, "x11"))
             return DisplayServerType_XOrg;
+        /* On systemd systems XDG_SESSION_TYPE is set to tty for ssh sessions. Check xserver processes then:*/
+        else if (RTStrIStr(pSessionType, "tty"))
+        {
+            if (RTProcIsRunningByName("Xorg"))
+                return DisplayServerType_XOrg;
+            else if (RTProcIsRunningByName("Xwayland"))
+                return DisplayServerType_XWayland;
+        }
     }
     return DisplayServerType_Unknown;