The change not to pass the 'upgrade' parameter in the frontend was made in
81a896883678d27c44e6407f2ec1e86c32e03403 (the commit doesn't talk about it, it's
likely an accidental squash of two changes)
Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
PVE/API2/Nodes.pm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 36cb70b4..7feb5662 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -1187,12 +1187,6 @@ __PACKAGE__->register_method ({
properties => {
node => get_standard_option('pve-node'),
proxy => get_standard_option('spice-proxy', { optional => 1 }),
- 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.",
@@ -1219,17 +1213,17 @@ __PACKAGE__->register_method ({
my ($user, undef, $realm) =
PVE::AccessControl::verify_username($authuser);
raise_perm_exc("realm != pam") if $realm ne 'pam';
- raise_perm_exc('user != root@pam') if $param->{upgrade} && $user ne
'root@pam';
+
+ if (defined($param->{cmd}) && $param->{cmd} eq 'upgrade' && $user ne
'root@pam') {
+ raise_perm_exc('user != root@pam');
+ }
my $node = $param->{node};
my $proxy = $param->{proxy};
my $authpath = "/nodes/$node";
my $permissions = 'Sys.Console';
- # FIXME: remove with 6.0
- if ($param->{upgrade}) {
- $param->{cmd} = 'upgrade';
- }
+
my $shcmd = get_shell_command($user, $param->{cmd},
$param->{'cmd-opts'});
my $title = "Shell on '$node'";
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
