5
0
mirror of git://git.proxmox.com/git/novnc-pve.git synced 2025-01-05 13:17:53 +03:00

support new 'cmd' parameter

We want to deprecate the 'upgrade' parameter in favor of a more
general 'cmd' parameter, which is easier to extend, e.g., for
installing pveceph through the WebUI.

Signed-off-by: Tim Marx <t.marx@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Tim Marx 2019-02-27 15:01:15 +01:00 committed by Thomas Lamprecht
parent abe37c0a61
commit 08db285b76
2 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,38 @@
From bc515ecef9162774bff846e362b4c8315032ea2a Mon Sep 17 00:00:00 2001
From: Tim Marx <t.marx@proxmox.com>
Date: Fri, 21 Dec 2018 11:46:13 +0100
Subject: [PATCH 12/12] pass custom command to vnc
Signed-off-by: Tim Marx <t.marx@proxmox.com>
---
app/pve.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/app/pve.js b/app/pve.js
index e2c37fb..9cf4b09 100644
--- a/app/pve.js
+++ b/app/pve.js
@@ -11,6 +11,7 @@ export default function PVEUI(UI){
this.vmname = WebUtil.getQueryVar('vmname');
this.nodename = WebUtil.getQueryVar('node');
this.resize = WebUtil.getQueryVar('resize');
+ this.cmd = WebUtil.getQueryVar('cmd');
this.lastFBWidth = undefined;
this.lastFBHeight = undefined;
this.sizeUpdateTimer = undefined;
@@ -47,6 +48,12 @@ export default function PVEUI(UI){
params.upgrade = 1;
title = 'System upgrade on node ' + this.nodename;
break;
+ case 'cmd':
+ url = baseUrl + '/vncshell';
+ params.cmd = decodeURI(this.cmd);
+ title = 'Install Ceph on node ' + this.nodename;
+
+ break;
default:
throw 'implement me';
break;
--
2.11.0

View File

@ -9,3 +9,4 @@
0009-decrease-animation-time.patch
0010-use-only-app.js.patch
0011-add-localCursor-setting-to-rfb.patch
0012-pass-custom-command-to-vnc.patch