mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2024-12-01 04:23:22 +01:00
vncserver: extract StartXAndRecordPID()
This commit is contained in:
parent
6181c249d7
commit
1bea4d0a41
@ -111,7 +111,7 @@ $cmd = &ConstructXvncCmd();
|
|||||||
|
|
||||||
# Run $cmd and record the process ID.
|
# Run $cmd and record the process ID.
|
||||||
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
||||||
system("$cmd & echo \$! >$pidFile");
|
&StartXAndRecordPID();
|
||||||
|
|
||||||
# Give Xvnc a chance to start up
|
# Give Xvnc a chance to start up
|
||||||
|
|
||||||
@ -130,7 +130,7 @@ if ($fontPath ne $defFontPath) {
|
|||||||
}
|
}
|
||||||
$cmd =~ s@-fp [^ ]+@@;
|
$cmd =~ s@-fp [^ ]+@@;
|
||||||
$cmd .= " -fp $defFontPath" if ($defFontPath);
|
$cmd .= " -fp $defFontPath" if ($defFontPath);
|
||||||
system("$cmd & echo \$! >$pidFile");
|
&StartXAndRecordPID();
|
||||||
sleep(3);
|
sleep(3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -939,3 +939,7 @@ sub ConstructXvncCmd {
|
|||||||
|
|
||||||
return $cmd;
|
return $cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub StartXAndRecordPID {
|
||||||
|
system("$cmd & echo \$! >$pidFile");
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user