proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-28 18:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #4522: api: vncproxy: also set environment variable for ticket without websocket

Browse Source 
Since commit 2dc0eb61 ("qm: assume correct VNC setup in 'vncproxy',
disallow passwordless"), 'qm vncproxy' will just fail when the
LC_PVE_TICKET environment variable is not set. Since it is not only
required in combination with websocket, drop that conditional.

For the non-serial case, this was the last remaining effect of the
'websocket' parameter, so update the parameter description.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2023-10-16 15:12:26 +02:00 committed by Thomas Lamprecht
parent 876d993886
commit 62c1904921
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Qemu.pm
View File

@ -2267,7 +2267,8 @@ __PACKAGE__->register_method({
websocket => {
optional => 1,
type => 'boolean',
description => "Prepare for websocket upgrade.",
description => "Prepare for websocket upgrade (only required when using "
."serial terminal, otherwise upgrade is always possible).",
},
'generate-password' => {
optional => 1,
@ -2365,7 +2366,7 @@ __PACKAGE__->register_method({
} else {
$ENV{LC_PVE_TICKET} = $password if $websocket; # set ticket with "qm vncproxy"
$ENV{LC_PVE_TICKET} = $password; # set ticket with "qm vncproxy"
$cmd = [@$remcmd, "/usr/sbin/qm", 'vncproxy', $vmid];