From 063f51c242517ef21f0f293e9b1bc96ad2bc623d Mon Sep 17 00:00:00 2001 From: ty Date: Tue, 25 Oct 2022 12:40:31 +0800 Subject: [PATCH] autosamba: fixes compatible with samba4 (#10315) Fix: coolsnowwolf/lede#10314 --- package/lean/autosamba/files/20-smb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package/lean/autosamba/files/20-smb b/package/lean/autosamba/files/20-smb index 2044e647c..ae00f8140 100755 --- a/package/lean/autosamba/files/20-smb +++ b/package/lean/autosamba/files/20-smb @@ -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 } }