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

vncserver: -select-de spike

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-20 22:35:12 +12:00
parent 551f292144
commit 3eb1ffd94b
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
unix/vncserver
View File

@ -46,6 +46,7 @@ use constant {
&AllowXProgramsToConnectToXvnc(); &AllowXProgramsToConnectToXvnc();
&EnsureAtLeastOneKasmUserExists(); &EnsureAtLeastOneKasmUserExists();
&AskUserToChooseDeOrManualXstartup();
&PrepareDefaultsForPassingToXvnc(); &PrepareDefaultsForPassingToXvnc();
&StartXvncOrExit(); &StartXvncOrExit();
@ -717,11 +718,18 @@ sub CreateDotVncDir {
} }
} }
sub AskUserToChooseDeOrManualXstartup { sub DeWasSelectedEarlier {
$selectDeCmd = "builder/startup/deb/select-de.sh"; -e $de_was_selected_file;
if (!$skipxstartup) {
system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
} }
sub AskUserToChooseDeOrManualXstartup {
if (&DeWasSelectedEarlier() && !$opt{'-select-de'}) {
return;
}
unlink $de_was_selected_file;
system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
} }
sub DetectDisplayNumberFromCliArgs { sub DetectDisplayNumberFromCliArgs {
@ -1007,6 +1015,9 @@ sub DefineFilePathsAndStuff {
$vncUserConfig = "$vncUserDir/config"; $vncUserConfig = "$vncUserDir/config";
$kasmPasswdFile = "$ENV{HOME}/.kasmpasswd"; $kasmPasswdFile = "$ENV{HOME}/.kasmpasswd";
$selectDeCmd = "/src/builder/startup/deb/select-de.sh";
$de_was_selected_file="$ENV{HOME}/.vnc/.de-was-selected";
$vncSystemConfigDir = "/etc/kasmvnc"; $vncSystemConfigDir = "/etc/kasmvnc";
$vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults"; $vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults";
$vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory"; $vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory";
@ -1033,7 +1044,7 @@ sub DefineFilePathsAndStuff {
} }
sub ParseAndProcessCliOptions { sub ParseAndProcessCliOptions {
my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1); my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-select-de",OPTIONAL_ARG_VALUE);
&ParseOptionsAndRemoveMatchesFromARGV(@supportedOptions); &ParseOptionsAndRemoveMatchesFromARGV(@supportedOptions);
&ProcessCliOptions(); &ProcessCliOptions();
&CheckGeometryAndDepthAreSensible(); &CheckGeometryAndDepthAreSensible();