From 7e40ac828ddbcac76cf4208bc3e3801e58e02889 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@global.leaseweb.com>
Date: Wed, 17 Mar 2021 09:21:21 +0000
Subject: [PATCH] novnc: Fix vm console is not working on firefox if language
 is not English

---
 .../main/java/com/cloud/servlet/ConsoleProxyServlet.java    | 6 ++++--
 systemvm/agent/noVNC/vnc.html                               | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
index 3cbb5f4b99e4..622a4c847615 100644
--- a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
@@ -495,8 +495,10 @@ private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO
         if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
             sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
         } else {
-            sb.append("/resource/noVNC/vnc.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token="
-                + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
+            sb.append("/resource/noVNC/vnc.html")
+                .append("?autoconnect=true")
+                .append("&port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT)
+                .append("&token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
         }
 
         // for console access, we need guest OS type to help implement keyboard
diff --git a/systemvm/agent/noVNC/vnc.html b/systemvm/agent/noVNC/vnc.html
index a244a7df82e9..04c00291abbb 100644
--- a/systemvm/agent/noVNC/vnc.html
+++ b/systemvm/agent/noVNC/vnc.html
@@ -333,9 +333,4 @@ <h1 class="noVNC_logo" translate="no" style="display: none;"><span>no</span><br>
         <source src="app/sounds/bell.mp3" type="audio/mpeg">
     </audio>
  </body>
- <script type="application/javascript">
-    window.onload = function() {
-        document.getElementById("noVNC_connect_button").click();
-    }
- </script>
 </html>