diff --git a/luci-app-webvirtcloud/Makefile b/luci-app-webvirtcloud/Makefile index b7b03fdb3..c0e2b318c 100644 --- a/luci-app-webvirtcloud/Makefile +++ b/luci-app-webvirtcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=0.3.8-20240822-1 +PKG_VERSION:=0.8.5-20241221-1 PKG_RELEASE:= LUCI_TITLE:=LuCI support for webvirtcloud @@ -13,6 +13,12 @@ define Package/luci-app-webvirtcloud/conffiles /etc/config/webvirtcloud endef +define Package/luci-app-webvirtcloud/prerm +#!/bin/sh +/usr/libexec/istorec/webvirtcloud.sh stop +exit 0 +endef + include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-webvirtcloud/luasrc/model/cbi/webvirtcloud/config.lua b/luci-app-webvirtcloud/luasrc/model/cbi/webvirtcloud/config.lua index 6d5f7d22b..87257d1c6 100644 --- a/luci-app-webvirtcloud/luasrc/model/cbi/webvirtcloud/config.lua +++ b/luci-app-webvirtcloud/luasrc/model/cbi/webvirtcloud/config.lua @@ -26,6 +26,7 @@ o = s:option(Value, "image_name", translate("Image").."*") o.rmempty = false o.datatype = "string" o:value("linkease/webvirtcloud:latest", "linkease/webvirtcloud:latest") +o:value("linkease/webvirtcloud:0.8.5", "linkease/webvirtcloud:0.8.5") o:value("linkease/webvirtcloud:0.3.6", "linkease/webvirtcloud:0.3.6") o.default = "linkease/webvirtcloud:latest" diff --git a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh index bd6cc7962..3d8c3b84e 100755 --- a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh +++ b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh @@ -54,7 +54,7 @@ do_install() { echo "$cmd" eval "$cmd" - sleep 5 + sleep 8 echo "Running status:" /usr/sbin/vmeasedaemon runningStatus --pretty } diff --git a/vmease/Makefile b/vmease/Makefile index c91bb4786..433fb1c78 100644 --- a/vmease/Makefile +++ b/vmease/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_ARCH_VMEASE:=$(ARCH) PKG_NAME:=vmease -PKG_VERSION:=0.5.1 -PKG_RELEASE:=$(PKG_ARCH_VMEASE)-2 +PKG_VERSION:=0.8.5 +PKG_RELEASE:=$(PKG_ARCH_VMEASE)-1 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://fw0.koolcenter.com/binary/vmease/ -PKG_HASH:=2ca2b8b276702a239f7f937363fcec925e93f687831e0494d231e642a0cd1d4b +PKG_HASH:=69a002b955850cd5f3b7c836fa3a706a89c149113271fd52dd9427453014c312 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)