extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-01-23 06:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: refactor

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-02 23:38:00 +12:00
parent 69a2f9a13b
commit c99d82fd8b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unix/vncserver
View File

@ -124,23 +124,14 @@ unless (&IsXvncRunning()) {
warn "\nNew '$desktopName' desktop is $host:$displayNumber\n"; warn "\nNew '$desktopName' desktop is $host:$displayNumber\n";
warn "\nUsername: $vncUserName\n\n"; warn "\nUsername: $vncUserName\n\n";
warn "Log file is $desktopLog\n\n";
if (! $skipxstartup) { if (! $skipxstartup) {
&CreateXstartupIfNeeded(); &CreateXstartupIfNeeded();
} }
&CreateUserConfigIfNeeded(); &CreateUserConfigIfNeeded();
# Run the X startup script.
if (! $skipxstartup) { if (! $skipxstartup) {
warn "Starting applications specified in $xstartupFile\n";
}
warn "Log file is $desktopLog\n\n";
if (! $skipxstartup) {
&DetectAndExportDisplay();
$ENV{VNCDESKTOP}= $desktopName;
&RunXstartup(); &RunXstartup();
} }
@ -663,6 +654,10 @@ sub DetectAndExportDisplay {
} }
sub RunXstartup { sub RunXstartup {
warn "Starting applications specified in $xstartupFile\n";
&DetectAndExportDisplay();
$ENV{VNCDESKTOP}= $desktopName;
if ($opt{'-fg'}) { if ($opt{'-fg'}) {
if (! $skipxstartup) { if (! $skipxstartup) {
system("$xstartupFile >> " . &quotedString($desktopLog) . " 2>&1"); system("$xstartupFile >> " . &quotedString($desktopLog) . " 2>&1");