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

Merge branch 'bugfix/KASM-5006-improve-xstartup-debug-output' into 'master'

Browse Source 
vncserver: more debug output for xstartup

Closes KASM-5006

See merge request kasm-technologies/internal/KasmVNC!113
This commit is contained in:
Matthew McClaskey 2023-10-20 11:35:19 +00:00
commit 7350b12b3d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/startup/deb/select-de.sh
View File

@ -198,6 +198,7 @@ generate_xstartup() {
cat <<-SCRIPT > "$xstartup_script" cat <<-SCRIPT > "$xstartup_script"
#!/bin/sh #!/bin/sh
set -x
$de_cmd $de_cmd
SCRIPT SCRIPT
chmod +x "$xstartup_script" chmod +x "$xstartup_script"

7
unix/vncserver
View File

@ -669,9 +669,10 @@ sub RunXstartup {
DetectAndExportDisplay(); DetectAndExportDisplay();
$ENV{VNCDESKTOP}= $desktopName; $ENV{VNCDESKTOP}= $desktopName;
my $xstartupCmd = "{ echo 'Running $xstartupFile'; $xstartupFile; }";
if ($opt{'-fg'}) { if ($opt{'-fg'}) {
if (! $skipxstartup) { if (! $skipxstartup) {
system("$xstartupFile >> " . quotedString($desktopLog) . " 2>&1"); system("$xstartupCmd >> " . quotedString($desktopLog) . " 2>&1");
} }
if (IsXvncRunning()) { if (IsXvncRunning()) {
$opt{'-kill'} = ':'.$displayNumber; $opt{'-kill'} = ':'.$displayNumber;
@ -680,12 +681,12 @@ sub RunXstartup {
} else { } else {
if ($opt{'-autokill'}) { if ($opt{'-autokill'}) {
if (! $skipxstartup) { if (! $skipxstartup) {
system("($xstartupFile; $0 -kill :$displayNumber) >> " system("($xstartupCmd; $0 -kill :$displayNumber) >> "
. quotedString($desktopLog) . " 2>&1 &"); . quotedString($desktopLog) . " 2>&1 &");
} }
} else { } else {
if (! $skipxstartup) { if (! $skipxstartup) {
system("$xstartupFile >> " . quotedString($desktopLog) system("$xstartupCmd >> " . quotedString($desktopLog)
. " 2>&1 &"); . " 2>&1 &");
} }
} }