From e606d5c5a7c5f0ddef8131eb5b49f7d98ae57540 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 24 Feb 2020 13:56:44 +0800 Subject: [PATCH] Merge Lean's source --- package/lean/automount/Makefile | 4 ++-- .../lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile index cb76823bc1..fca993f47b 100644 --- a/package/lean/automount/Makefile +++ b/package/lean/automount/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=automount PKG_VERSION:=1 -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_ARCH:=all include $(INCLUDE_DIR)/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/automount TITLE:=Mount autoconfig hotplug script. MAINTAINER:=Lean - DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +antfs-mount + DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +ntfs-3g endef define Package/automount/description diff --git a/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server b/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server index ba4f90653f..a2353be622 100755 --- a/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server +++ b/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server @@ -18,11 +18,11 @@ gen_v2ray_config_file() { start_v2ray_server() { config_foreach gen_v2ray_config_file "user" - fw3 reload + fw3 reload > /dev/null 2>&1 } stop_v2ray_server() { - fw3 reload + fw3 reload > /dev/null 2>&1 ps -w | grep "$CONFIG_PATH/" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & } @@ -46,4 +46,4 @@ restart() { stop sleep 1 start -} \ No newline at end of file +}