From b97c78245db5b79a58cf760c15a7d23d80f77988 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sat, 23 Mar 2024 10:16:32 +0800 Subject: [PATCH] update 2024-03-23 10:16:32 --- luci-app-webvirtcloud/Makefile | 2 +- .../root/usr/libexec/istorec/webvirtcloud.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/luci-app-webvirtcloud/Makefile b/luci-app-webvirtcloud/Makefile index ac45fb33b..784569a90 100644 --- a/luci-app-webvirtcloud/Makefile +++ b/luci-app-webvirtcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=0.3.8-20231208-1 +PKG_VERSION:=0.3.8-20230323-1 PKG_RELEASE:= LUCI_TITLE:=LuCI support for webvirtcloud diff --git a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh index 6bc3408ce..98b6e6fb1 100755 --- a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh +++ b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh @@ -22,6 +22,9 @@ do_install() { echo "docker pull ${IMAGE_NAME}" docker pull ${IMAGE_NAME} docker rm -f webvirtcloud + mkdir -p "$config" + rm -rf "$config/vmwebvirt" + cp /usr/sbin/vmeasedaemon "$config/vmwebvirt" local cmd="docker run --restart=unless-stopped -d \ --cgroupns=host \ @@ -31,7 +34,7 @@ do_install() { -v \"$config/dbconfig:/srv/webvirtcloud/dbconfig\" \ -v \"$config/libvirt:/etc/libvirt\" \ -v \"$config/images:/var/lib/libvirt/images\" \ - -v /usr/sbin/vmeasedaemon:/usr/sbin/vmwebvirt \ + -v \"$config/vmwebvirt:/usr/sbin/vmwebvirt\" \ -v /var/run/vmease:/srv/vmease \ -p $port:80 \ --privileged \ @@ -87,7 +90,6 @@ case ${ACTION} in docker ${ACTION} webvirtcloud ;; "stop") - /etc/init.d/vmease stop docker ${ACTION} webvirtcloud ;; "restart")