diff --git a/package/lean/autosamba/Makefile b/package/lean/autosamba/Makefile index f6d765da7e..b035f9bb47 100644 --- a/package/lean/autosamba/Makefile +++ b/package/lean/autosamba/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autosamba PKG_VERSION:=1 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_ARCH:=all include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autosamba/files/20-smb b/package/lean/autosamba/files/20-smb index 7a2056cd06..72e6faf751 100755 --- a/package/lean/autosamba/files/20-smb +++ b/package/lean/autosamba/files/20-smb @@ -92,7 +92,6 @@ case "$ACTION" in auto=`uci get samba.@sambashare[$i].auto` [ $auto = "1" ] && { mount_dir=`uci get samba.@sambashare[$i].name` - rm -rf /mnt/$device /mnt/$mount_dir uci delete samba.@sambashare[$i] uci commit /etc/init.d/samba reload diff --git a/package/lean/luci-app-nps/root/etc/init.d/nps b/package/lean/luci-app-nps/root/etc/init.d/nps index be3db8f5d6..e9ab09f96d 100755 --- a/package/lean/luci-app-nps/root/etc/init.d/nps +++ b/package/lean/luci-app-nps/root/etc/init.d/nps @@ -2,8 +2,7 @@ # Copyright (C) 2006-2011 OpenWrt.org START=50 -SERVICE_WRITE_PID=1 -SERVICE_DAEMONIZE=1 +USE_PROCD=1 LOGFILE="/var/etc/nps.log" tmpconf="/tmp/etc/nps.conf" @@ -46,23 +45,20 @@ nps_write_bool() { fi } -start() { +start_service() { config_load nps config_foreach nps_header nps - if [ "$Enabled" = "0" ];then - stop - else - logger -t FRPC 'Starting Nps service' - service_start /usr/bin/npc -config=$tmpconf -log_level=$Log_level -log_path=$LOGFILE + if [ "$Enabled" = "1" ];then + logger -t FRPC 'Starting Nps service' + #service_start /usr/bin/npc -config=$tmpconf -log_level=$Log_level -log_path=$LOGFILE + procd_open_instance + procd_set_param command /usr/bin/npc -config=$tmpconf -log_level=$Log_level + procd_set_param file $tmpconf + procd_set_param respawn + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance fi - - return 0 } -stop() { - service_stop /usr/bin/npc - rm $tmpconf - logger -t FRPC 'Nps service stopped' - return 0 -} diff --git a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf b/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf index f272234d4e..980db214c2 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf +++ b/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf @@ -2125,7 +2125,6 @@ ipset=/.softether.org/gfwlist ipset=/.softwarebychuck.com/gfwlist ipset=/.so-ga.net/gfwlist ipset=/.sogclub.com/gfwlist -ipset=/.sogou.com/gfwlist ipset=/.sogrady.me/gfwlist ipset=/.sohcradio.com/gfwlist ipset=/.sohfrance.org/gfwlist @@ -5065,7 +5064,6 @@ server=/.softether.org/127.0.0.1#5335 server=/.softwarebychuck.com/127.0.0.1#5335 server=/.so-ga.net/127.0.0.1#5335 server=/.sogclub.com/127.0.0.1#5335 -server=/.sogou.com/127.0.0.1#5335 server=/.sogrady.me/127.0.0.1#5335 server=/.sohcradio.com/127.0.0.1#5335 server=/.sohfrance.org/127.0.0.1#5335