From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 07/12] api: nodes: remove deprecated upgrade parameter for vncshell
Date: Fri, 4 Jun 2021 15:49:41 +0200 [thread overview]
Message-ID: <20210604134946.152720-18-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Depends on novnc-pve patch (and clearing the browser cache ;)
PVE/API2/Nodes.pm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 7feb5662..369c911c 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -906,12 +906,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.",
@@ -964,7 +958,10 @@ __PACKAGE__->register_method ({
my ($user, undef, $realm) = PVE::AccessControl::verify_username($rpcenv->get_user());
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};
@@ -976,10 +973,6 @@ __PACKAGE__->register_method ({
my ($port, $remcmd) = $get_vnc_connection_info->($node);
- # FIXME: remove with 6.0
- if ($param->{upgrade}) {
- $param->{cmd} = 'upgrade';
- }
my $shcmd = get_shell_command($user, $param->{cmd}, $param->{'cmd-opts'});
my $timeout = 10;
--
2.30.2
next prev parent reply other threads:[~2021-06-04 13:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 13:49 [pve-devel] [PATCH-SERIES] Some breaking API changes/cleanups Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH guest-common 1/2] vzdump: remove deprecated size parameter Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH/RFC guest-common 2/2] vzdump: defaults: keep all backups by default for 7.0 Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH container 1/1] migrate: remove deprecated force parameter Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH qemu-server 1/3] Revert "revert spice_ticket prefix change in 7827de4" Fabian Ebner
2021-06-07 8:27 ` Stefan Reiter
2021-06-04 13:49 ` [pve-devel] [PATCH qemu-server 2/3] scan volids: remove superfluous parameter Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH qemu-server 3/3] vm destroy: do not remove unreferenced disks by default Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH/RFC storage 1/3] postinst: move cifs credential files into subdirectory upon update Fabian Ebner
2021-06-08 13:18 ` Fabian Grünbichler
2021-06-09 6:35 ` Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH storage 2/3] update reminder to remove maxfiles Fabian Ebner
2021-06-08 13:04 ` Fabian Grünbichler
2021-06-08 16:23 ` Thomas Lamprecht
2021-06-09 6:30 ` Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH storage 3/3] api: get rid of moved 'usb' call Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH novnc-pve 1/1] avoid passing deprecated 'upgrade' parameter Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 01/12] vzdump: remove deprecated size parameter Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 02/12] configs: vzdump: use prune-backups instead of the deprecated maxfiles Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 03/12] test: vzdump: adapt to new default Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 04/12] Revert "VZDump: add TARFILE to environment for hookscripts" Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 05/12] api: nodes: remove deprecated upgrade parameter for xtermjs Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 06/12] api: nodes: remove deprecated upgrade parameter for spiceshell Fabian Ebner
2021-06-04 13:49 ` Fabian Ebner [this message]
2021-06-04 13:49 ` [pve-devel] [PATCH manager 08/12] api: move cpu path into qemu/capabilities Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 09/12] api: ceph: remove obsoleted disks call Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 10/12] api: ceph: remove moved 'flags' calls Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 11/12] api: ceph: osd: create: rename size parameters Fabian Ebner
2021-06-04 13:49 ` [pve-devel] [PATCH manager 12/12] cli: pveceph: remove outdated comment Fabian Ebner
2021-06-09 9:44 ` [pve-devel] applied-partially: [PATCH-SERIES] Some breaking API changes/cleanups Fabian Grünbichler
2021-06-09 11:15 ` Fabian Ebner
2021-06-10 9:36 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210604134946.152720-18-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox