vncserver: extract PrepareDefaultsForPassingToXvnc()

This commit is contained in:
Dmitry Maksyoma 2021-08-09 23:38:20 +12:00
parent b26a20d44d
commit a44241971e

View File

@ -37,14 +37,7 @@ $desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
&CreateDotVncDir();
my %default_opts;
my %config;
# We set some reasonable defaults. Config file settings
# override these where present.
&SetReasonabeDefaults();
&LoadSystemThenUserThenMandatoryConfigs();
&PrepareDefaultsForPassingToXvnc();
&DisableVncAuth();
$kasmAuthEnabled = 1;
@ -1043,3 +1036,13 @@ sub ParseAndProcessCliOptions {
&GetLowestAvailableDisplayNumber();
&CheckCliOptionsForBeingValid();
}
sub PrepareDefaultsForPassingToXvnc {
# We set some reasonable defaults. Config file settings
# override these where present.
%default_opts;
%config;
&SetReasonabeDefaults();
&LoadSystemThenUserThenMandatoryConfigs();
}