298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

autosamba: fixes compatible with samba4 (#10315)

Browse Source 
Fix: coolsnowwolf/lede#10314
This commit is contained in:
ty 2022-10-25 12:40:31 +08:00 committed by GitHub
parent 613e76c9e0
commit 063f51c242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/lean/autosamba/files/20-smb
View File

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