File tree Expand file tree Collapse file tree 2 files changed +1
-8
lines changed
Expand file tree Collapse file tree 2 files changed +1
-8
lines changed Original file line number Diff line number Diff line change 11#! /bin/sh
22# Xsetup - run as root before the login dialog appears
3-
4- # Allow all client connect to the Xorg server. Since our X server is started as
5- # root, but sessions are started as user.
6- xhost +
Original file line number Diff line number Diff line change @@ -82,8 +82,7 @@ namespace DDM {
8282 // If the Xorg display server was already started, write the passed
8383 // auth cookie to /tmp/xauth_XXXXXX. This is done in the parent process
8484 // so that it can clean up the file on session end.
85- if (env.value (QStringLiteral (" XDG_SESSION_TYPE" )) == QLatin1String (" x11" )
86- && m_displayServerCmd.isEmpty ()) {
85+ if (env.value (QStringLiteral (" XDG_SESSION_TYPE" )) == QLatin1String (" x11" )) {
8786 // Create the Xauthority file
8887 QByteArray cookie = helper->cookie ();
8988 if (cookie.isEmpty ()) {
@@ -111,9 +110,7 @@ namespace DDM {
111110
112111 env.insert (QStringLiteral (" XAUTHORITY" ), m_xauthFile.fileName ());
113112 setProcessEnvironment (env);
114- }
115113
116- if (env.value (QStringLiteral (" XDG_SESSION_TYPE" )) == QLatin1String (" x11" )) {
117114 QString command;
118115 if (env.value (QStringLiteral (" XDG_SESSION_CLASS" )) == QLatin1String (" greeter" )) {
119116 command = m_path;
You can’t perform that action at this time.
0 commit comments