From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] API2/Nodes/termproxy: fix upgrade for new xtermjs package
Date: Wed, 25 Nov 2020 09:57:11 +0100 [thread overview]
Message-ID: <20201125085711.12574-1-d.csapak@proxmox.com> (raw)
we changed how we call upgrade (cmd param instead of upgrade)
so we have to adapt our api call
most is taken from pve
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PMG/API2/Nodes.pm | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/PMG/API2/Nodes.pm b/src/PMG/API2/Nodes.pm
index 259f8f3..e368569 100644
--- a/src/PMG/API2/Nodes.pm
+++ b/src/PMG/API2/Nodes.pm
@@ -348,10 +348,24 @@ __PACKAGE__->register_method ({
node => get_standard_option('pve-node'),
upgrade => {
type => 'boolean',
- description => "Run 'apt-get dist-upgrade' instead of normal shell.",
+ 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.",
+ enum => ['login', 'upgrade'],
+ optional => 1,
+ default => 'login',
+ },
+ 'cmd-opts' => {
+ type => 'string',
+ description => "Add parameters to a command. Encoded as null terminated strings.",
+ requires => 'cmd',
+ optional => 1,
+ default => '',
+ },
},
},
returns => {
@@ -384,17 +398,21 @@ __PACKAGE__->register_method ({
my $family = PVE::Tools::get_host_address_family($node);
my $port = PVE::Tools::next_vnc_port($family);
+ # FIXME: remove with 7.0
+ if ($param->{upgrade}) {
+ $param->{cmd} = 'upgrade';
+ }
+
my $shcmd;
if ($user eq 'root@pam') {
- if ($param->{upgrade}) {
- my $upgradecmd = "pmgupgrade --shell";
- # $upgradecmd = PVE::Tools::shellquote($upgradecmd) if $remip;
- $shcmd = [ '/bin/bash', '-c', $upgradecmd ];
+ if (defined($param->{cmd}) && $param->{cmd} eq 'upgrade') {
+ $shcmd = [ 'pmgupgrade', '--shell' ];
} else {
$shcmd = [ '/bin/login', '-f', 'root' ];
}
} else {
+ # non-root must always login for now, we do not have a superuser role!
$shcmd = [ '/bin/login' ];
}
--
2.20.1
next reply other threads:[~2020-11-25 8:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 8:57 Dominik Csapak [this message]
2020-11-25 9:11 ` Stoiko Ivanov
2020-11-25 9:18 ` Thomas Lamprecht
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=20201125085711.12574-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pmg-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