upgrade to samba4 for autosamba (#11)

This commit is contained in:
ty 2022-10-25 14:42:58 +08:00 committed by GitHub
parent 5406fac961
commit 409269b7c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions

View File

@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/autosamba
TITLE:=Samba autoconfig hotplug script.
MAINTAINER:=Lean
DEPENDS:=+luci-app-samba +wsdd2
DEPENDS:=+luci-app-samba4 +wsdd2
endef
define Package/autosamba/description

View File

@ -11,7 +11,7 @@
. /lib/functions/service.sh
global=0
config_file="/etc/config/samba"
config_file="/etc/config/samba4"
wait_for_init() {
for i in `seq 30`
@ -35,8 +35,8 @@ chk_en() {
[ $autoshare -eq 0 ] && exit
}
config_load samba
config_foreach chk_en samba
config_load samba4
config_foreach chk_en samba4
device=`basename $DEVPATH`
@ -75,7 +75,8 @@ case "$ACTION" in
echo -e "\toption create_mask '0666'" >> $config_file
echo -e "\toption dir_mask '0777'" >> $config_file
echo -e "\toption device '$device'" >> $config_file
/etc/init.d/samba reload
echo -e "\toption inherit_owner 'yes'" >> $config_file
/etc/init.d/samba4 reload
return
fi
fi
@ -86,16 +87,16 @@ case "$ACTION" in
i=0
while true
do
dev=`uci get samba.@sambashare[$i].device`
dev=`uci get samba4.@sambashare[$i].device`
[ $? -ne 0 ] && break
[ "$dev" = "$device" ] && {
auto=`uci get samba.@sambashare[$i].auto`
auto=`uci get samba4.@sambashare[$i].auto`
[ $auto = "1" ] && {
mount_dir=`uci get samba.@sambashare[$i].name`
uci delete samba.@sambashare[$i]
mount_dir=`uci get samba4.@sambashare[$i].name`
uci delete samba4.@sambashare[$i]
uci commit
/etc/init.d/samba reload
/etc/init.d/samba4 reload
return
}
}