vncserver: refactor
This commit is contained in:
@@ -32,8 +32,6 @@ use Time::HiRes qw (sleep);
|
|||||||
&SetGlobalVariables();
|
&SetGlobalVariables();
|
||||||
|
|
||||||
&ParseAndProcessCliOptions();
|
&ParseAndProcessCliOptions();
|
||||||
$vncPort = 5900 + $displayNumber;
|
|
||||||
$desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
|
|
||||||
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
|
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
|
||||||
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
||||||
|
|
||||||
@@ -1043,6 +1041,9 @@ sub PrepareDefaultsForPassingToXvnc {
|
|||||||
%default_opts;
|
%default_opts;
|
||||||
%config;
|
%config;
|
||||||
|
|
||||||
|
$vncPort = 5900 + $displayNumber;
|
||||||
|
$desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
|
||||||
|
|
||||||
&SetReasonabeDefaults();
|
&SetReasonabeDefaults();
|
||||||
&LoadSystemThenUserThenMandatoryConfigs();
|
&LoadSystemThenUserThenMandatoryConfigs();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user