From 5489ea5278ef6d6b18b6df93fa8ac7a4a508291f Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Fri, 4 Jun 2021 15:49:39 +0200 Subject: [PATCH] api: nodes: remove deprecated upgrade parameter for xtermjs The switch to 'cmd' was made by commit af39a6f09651e15d1c83536e25493a2212efd7d3 in the pve-xtermjs repo and is included in 4.7.0 Signed-off-by: Fabian Ebner --- PVE/API2/Nodes.pm | 10 ---------- debian/control | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index e58d9c10..36cb70b4 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -1053,12 +1053,6 @@ __PACKAGE__->register_method ({ additionalProperties => 0, properties => { node => get_standard_option('pve-node'), - upgrade => { - type => 'boolean', - description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.", - optional => 1, - default => 0, - }, cmd => { type => 'string', description => "Run specific command or default to login.", @@ -1097,10 +1091,6 @@ __PACKAGE__->register_method ({ my ($port, $remcmd) = $get_vnc_connection_info->($node); - # FIXME: remove with 7.0 - if ($param->{upgrade}) { - $param->{cmd} = 'upgrade'; - } my $shcmd = get_shell_command($user, $param->{cmd}, $param->{'cmd-opts'}); my $realcmd = sub { diff --git a/debian/control b/debian/control index 1b1c248a..91ded19a 100644 --- a/debian/control +++ b/debian/control @@ -77,7 +77,7 @@ Depends: apt-transport-https | apt (>= 1.5~), pve-firewall, pve-ha-manager, pve-i18n (>= 1.0-3), - pve-xtermjs (>= 0.1-1), + pve-xtermjs (>= 4.7.0-1), qemu-server (>= 6.2-17), rsync, spiceterm,