|
|
|
@ -49,22 +49,7 @@ if ($kasmAuthEnabled) {
|
|
|
|
|
|
|
|
|
|
&SetupXauthorityFile();
|
|
|
|
|
|
|
|
|
|
# Now start the X VNC Server
|
|
|
|
|
|
|
|
|
|
$cmd = &ConstructXvncCmd();
|
|
|
|
|
|
|
|
|
|
&DeleteLogLeftFromPreviousXvncRun();
|
|
|
|
|
&StartXvncAndRecordPID();
|
|
|
|
|
&WaitForXvncToRespond();
|
|
|
|
|
|
|
|
|
|
if (!&IsXvncRunning() && !&UsingSafeFontPath()) {
|
|
|
|
|
&StartXvncWithSafeFontPath();
|
|
|
|
|
&WaitForXvncToRespond();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unless (&IsXvncRunning()) {
|
|
|
|
|
&WarnUserXvncNotStartedAndExit();
|
|
|
|
|
}
|
|
|
|
|
&StartXvncOrExit();
|
|
|
|
|
|
|
|
|
|
warn "\nNew '$desktopName' desktop is $host:$displayNumber\n";
|
|
|
|
|
&PrintKasmUsers();
|
|
|
|
@ -1067,3 +1052,20 @@ sub EnsureAtLeastOneKasmUserExists {
|
|
|
|
|
@kasmPasswdUsers = &LoadKasmPasswdUsers();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sub StartXvncOrExit {
|
|
|
|
|
$cmd = &ConstructXvncCmd();
|
|
|
|
|
|
|
|
|
|
&DeleteLogLeftFromPreviousXvncRun();
|
|
|
|
|
&StartXvncAndRecordPID();
|
|
|
|
|
&WaitForXvncToRespond();
|
|
|
|
|
|
|
|
|
|
if (!&IsXvncRunning() && !&UsingSafeFontPath()) {
|
|
|
|
|
&StartXvncWithSafeFontPath();
|
|
|
|
|
&WaitForXvncToRespond();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unless (&IsXvncRunning()) {
|
|
|
|
|
&WarnUserXvncNotStartedAndExit();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|