[pmg-devel] [PATCH pmg-api] API2/Nodes/termproxy: fix upgrade for new xtermjs package

[Dominik Csapak]

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 at 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 at 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