diff --git a/gn/Makefile b/gn/Makefile index 311aead23..aabc09600 100644 --- a/gn/Makefile +++ b/gn/Makefile @@ -38,7 +38,8 @@ endef define Host/Configure $(PYTHON) $(HOST_BUILD_DIR)/build/gen.py \ - --no-last-commit-position + --no-last-commit-position \ + --allow-warnings endef define Host/Compile diff --git a/luci-app-openclash/Makefile b/luci-app-openclash/Makefile index 2ce9d306a..1a61e2691 100644 --- a/luci-app-openclash/Makefile +++ b/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.47.022 +PKG_VERSION:=0.47.023 PKG_MAINTAINER:=vernesong PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/luci-app-openclash/root/etc/init.d/openclash b/luci-app-openclash/root/etc/init.d/openclash index 7ddc4c4d0..6db44aaa3 100644 --- a/luci-app-openclash/root/etc/init.d/openclash +++ b/luci-app-openclash/root/etc/init.d/openclash @@ -653,6 +653,10 @@ do_run_file() check_mod() { + # 容器环境下跳过内核模块检查 + if grep -qE 'docker|containerd|lxc|podman|kubepods|container' /proc/1/cgroup; then + return + fi modprobe $1 if [ -z "$(lsmod |awk '{print $1}' |grep ^$1$)" ]; then LOG_OUT "Error:【$1】module not found, please check your system depends and try again!"