[pve-devel] applied: [PATCH manager v3] correct the upgradecmd for xtermjs

[Wolfgang Bumiller]

applied

On Wed, Jan 17, 2018 at 10:33:19AM +0100, Dominik Csapak wrote:
> use the pveupgrade command directly without bash inbetween,
> the incorrect quoting led to '--shell' not being passed to
> pveupgrade and closing the connection
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
> changes from v2:
> * changed commit message to better reflect the change
> * use pveupgrade directly
>  PVE/API2/Nodes.pm | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
> index f11fd169..ed6779e6 100644
> --- a/PVE/API2/Nodes.pm
> +++ b/PVE/API2/Nodes.pm
> @@ -822,8 +822,7 @@ __PACKAGE__->register_method ({
>  
>  	if ($user eq 'root at pam') {
>  	    if ($param->{upgrade}) {
> -		my $upgradecmd = "pveupgrade --shell";
> -		$concmd = [ '/bin/bash', '-c', $upgradecmd ];
> +		$concmd = [ '/usr/bin/pveupgrade', '--shell' ];
>  	    } else {
>  		$concmd = [ '/bin/login', '-f', 'root' ];
>  	    }
> -- 
> 2.11.0