From 89618f948851e0a868296b6e84a4f3420a16f0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bierwolf?= Date: Wed, 7 Mar 2018 13:51:49 +0100 Subject: testing/kimchi: fix for novnc 1.0.0 --- testing/kimchi/APKBUILD | 4 ++-- testing/kimchi/alpine-specific-kimchi.api.patch | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'testing') diff --git a/testing/kimchi/APKBUILD b/testing/kimchi/APKBUILD index 06fb93bf89..e79a355c4b 100644 --- a/testing/kimchi/APKBUILD +++ b/testing/kimchi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista pkgname=kimchi pkgver=2.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="An HTML5 management interface for KVM" url="https://github.com/kimchi-project/kimchi" arch="noarch !s390x" @@ -81,5 +81,5 @@ package() { } sha512sums="bcf20590d60cf3c82e34cb32e3a65aa7c87426eb721af7098234c5e1ff6fd1766b44d45d4ff4283e7122f370914e58b67fed1ba7b97df0cc26e614a4b66eb2d1 kimchi-2.5.0.tar.gz -ac0cb9517161262109d754a469507dbb81607f52443514b227c3088ea11271ee465f017d6076519b820bc4021fd69eca3484059553072062f18334c69c5fb36a alpine-specific-kimchi.api.patch +402ccb180ae283c38dea44ef03ed563e401d87f741473a6fa4c582845f21f8e37bf506d66ca45e0e5e6982aa4f26a21452ac98d6ca7cffaba68c8d744e47505e alpine-specific-kimchi.api.patch a78c51237233b629c84106cfcdc8398a030889dd8bc641630a8c4e05fdad8d32a9b457c36188e1752a1277ef884437c1765c897bc2a33ca87c07e3bafdfdd5bf systemd-substitution-with-openrc.patch" diff --git a/testing/kimchi/alpine-specific-kimchi.api.patch b/testing/kimchi/alpine-specific-kimchi.api.patch index e092f46c70..1260c18194 100644 --- a/testing/kimchi/alpine-specific-kimchi.api.patch +++ b/testing/kimchi/alpine-specific-kimchi.api.patch @@ -9,9 +9,12 @@ url += "?token=" + wok.urlSafeB64Encode(vm+'-console').replace(/=*$/g, ""); url += '&encrypt=1'; window.open(url); -@@ -348,7 +348,7 @@ +@@ -346,9 +346,9 @@ + }).done(function() { + url = 'https://' + location.hostname + ':' + proxy_port; url += server_root; - url += "/plugins/kimchi/novnc/vnc_auto.html"; +- url += "/plugins/kimchi/novnc/vnc_auto.html"; ++ url += "/plugins/kimchi/novnc/vnc_lite.html"; url += "?port=" + proxy_port; - url += "&path=" + server_root + "/websockify"; + url += "&path=" + server_root + "websockify"; -- cgit v1.2.3