Skip to content

Commit 24ced88

Browse files
committed
jfLogon : always creat xauth
1 parent f55ed95 commit 24ced88

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

projects/jflogon/src/Startup.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ public static void serviceStart(String[] args) {
4646
new DeviceMonitor().start();
4747
//stop plymouth
4848
hidePlymouth();
49-
if (!wayland) {
50-
create_server_xauth();
51-
}
49+
create_server_xauth();
5250
boolean retry;
5351
if (wayland) {
5452
config_labwc();
@@ -158,7 +156,7 @@ private static void startUI(String[] cmds, String[] env) throws Exception {
158156
process.addEnvironmentVariable(name, value);
159157
}
160158
}
161-
JFLog.log("Starting Display Server...");
159+
JFLog.log("Starting Logon Greeter...");
162160
process.run(cmds, true);
163161
}
164162

@@ -221,11 +219,9 @@ public static void runSession(String user, String session, String env_names[], S
221219
stop();
222220
}
223221
getUserDetails(user);
224-
if (!wayland) {
225-
String xauthFile = homePath + "/.Xauthority";
226-
write_xauth(xauthFile);
227-
chown_xauth(xauthFile, user);
228-
}
222+
String xauthFile = homePath + "/.Xauthority";
223+
write_xauth(xauthFile);
224+
chown_xauth(xauthFile, user);
229225
if (!Linux.isMemberOf(user, "audio")) {
230226
//pulseaudio requires user to be member of 'audio' group
231227
JF.exec(new String[] {"usermod", "-aG", "audio", user});
@@ -250,9 +246,7 @@ public static void runSession(String user, String session, String env_names[], S
250246
env.put("LOGNAME", user);
251247
env.put("SHELL", shellPath);
252248
env.put("HOME", homePath);
253-
if (!wayland) {
254-
env.put("XAUTHORITY", homePath + "/.Xauthority");
255-
}
249+
env.put("XAUTHORITY", homePath + "/.Xauthority");
256250
env.put("JID", jid);
257251
JFLog.log("JID=" + jid);
258252
if (env_names != null) {

0 commit comments

Comments
 (0)