From a2ad79ba5b174cf9299df969270f80c4bf28c808 Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Thu, 7 Dec 2023 18:40:38 +0800
Subject: [PATCH] fix webvirtcloud of network

---
 applications/luci-app-webvirtcloud/Makefile                   | 2 +-
 applications/luci-app-webvirtcloud/po/zh-cn/webvirtcloud.po   | 4 ++--
 .../root/usr/libexec/istorec/webvirtcloud.sh                  | 4 +++-
 applications/vmease/Makefile                                  | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/applications/luci-app-webvirtcloud/Makefile b/applications/luci-app-webvirtcloud/Makefile
index d9bc147d..0da83b84 100644
--- a/applications/luci-app-webvirtcloud/Makefile
+++ b/applications/luci-app-webvirtcloud/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=0.3.6-20231201
+PKG_VERSION:=0.3.8-20231207
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for webvirtcloud
diff --git a/applications/luci-app-webvirtcloud/po/zh-cn/webvirtcloud.po b/applications/luci-app-webvirtcloud/po/zh-cn/webvirtcloud.po
index a663e645..2b87e6b6 100644
--- a/applications/luci-app-webvirtcloud/po/zh-cn/webvirtcloud.po
+++ b/applications/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"
diff --git a/applications/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh b/applications/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
index 4f3d67c6..525d3164 100755
--- a/applications/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
+++ b/applications/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
@@ -24,7 +24,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 +39,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"
diff --git a/applications/vmease/Makefile b/applications/vmease/Makefile
index f7ba952e..0e10d637 100644
--- a/applications/vmease/Makefile
+++ b/applications/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.8
 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:=aff74423d5c603774709fbc2723b28d7784fe84902eabbcaeb33f5231fa357ca
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)