update 2023-12-07 23:35:53

luci-app-webvirtcloud/Makefile

@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=0.3.6-20231201
+PKG_VERSION:=0.3.8-20231208
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for webvirtcloud

luci-app-webvirtcloud/po/zh-cn/webvirtcloud.po

@@ -17,7 +17,7 @@ msgid "Service Status"
 msgstr "服务状态"
 
 msgid "WebVirtCloud status:"
-msgstr "Home Assistant 的状态信息如下："
+msgstr "WebVirtCloud 的状态信息如下："
 
 msgid "Setup"
 msgstr "安装配置"
@@ -32,7 +32,7 @@ msgid "WebVirtCloud is running"
 msgstr "WebVirtCloud 运行中"
 
 msgid "WebVirtCloud is not running"
-msgstr "Home Assistant 未运行"
+msgstr "WebVirtCloud 未运行"
 
 msgid "Open the WebVirtCloud"
 msgstr "打开 WebVirtCloud"

luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh

@@ -15,6 +15,10 @@ do_install() {
   fi
   [ -z "$port" ] && port=6009
 
+  echo "start vmease"
+  /etc/init.d/vmease start
+  sleep 1
+
   echo "docker pull ${IMAGE_NAME}"
   docker pull ${IMAGE_NAME}
   docker rm -f webvirtcloud
@@ -24,7 +28,6 @@ do_install() {
     --tmpfs /tmp \
     --tmpfs /run/lock \
     -v /sys/fs/cgroup:/sys/fs/cgroup \
-    -v /mnt:/mnt:rslave \
     -v \"$config/dbconfig:/srv/webvirtcloud/dbconfig\" \
     -v \"$config/libvirt:/etc/libvirt\" \
     -v \"$config/images:/var/lib/libvirt/images\" \
@@ -40,6 +43,9 @@ do_install() {
   fi
   [ -z "$tz" ] || cmd="$cmd -e TZ=\"$tz\""
 
+  cmd="$cmd -v /mnt:/mnt"
+  mountpoint -q /mnt && cmd="$cmd:rslave"
+
   cmd="$cmd --name webvirtcloud \"$IMAGE_NAME\""
 
   echo "$cmd"
@@ -75,7 +81,18 @@ case ${ACTION} in
   "rm")
     docker rm -f webvirtcloud
   ;;
-  "start" | "stop" | "restart")
+  "start")
+    /etc/init.d/vmease start
+    sleep 1
+    docker ${ACTION} webvirtcloud
+  ;;
+  "stop")
+    /etc/init.d/vmease stop
+    docker ${ACTION} webvirtcloud
+  ;;
+  "restart")
+    /etc/init.d/vmease start
+    sleep 1
     docker ${ACTION} webvirtcloud
   ;;
   "status")

vmease/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_VMEASE:=$(ARCH)
 
 PKG_NAME:=vmease
-PKG_VERSION:=0.3.7
+PKG_VERSION:=0.3.9
 PKG_RELEASE:=$(PKG_ARCH_VMEASE)-2
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fw0.koolcenter.com/binary/vmease/
-PKG_HASH:=809d9b95fe8d46471dda8d8b91f2df8632c695c04dabd833f28a6548ab863075
+PKG_HASH:=862eed6f8744c2524bc23e4478975412060fdb53a4b99e9c0d6b9e8f1cf86494
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)