autosamba: compatible with samba4

- samba4 config file path: /etc/config/samba4
- samba4 config name: samba4
- samba4 init path: /etc/init.d/samba4

package/emortal/autosamba/Makefile

@@ -25,12 +25,11 @@ define Package/autosamba/description
 endef
 
 define Build/Compile
-	true
 endef
 
 define Package/autosamba/install
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
-	$(INSTALL_BIN) ./files/20-smb $(1)/etc/hotplug.d/block/20-smb
+	$(INSTALL_BIN) ./files/20-smb $(1)/etc/hotplug.d/block/
 endef
 
 $(eval $(call BuildPackage,autosamba))

package/emortal/autosamba/files/20-smb

@@ -1,32 +1,33 @@
 #!/bin/sh
-# 
+
-#   D-Team Technology Co.,Ltd. ShenZhen
+#
-#   作者:Vic
+#  D-Team Technology Co.,Ltd. ShenZhen
-# 
+#  作者:Vic
 #
 # 警告:对着屏幕的哥们,我们允许你使用此脚本，但不允许你抹去作者的信息,请保留这段话。
 #
+
 . /lib/functions.sh
 . /lib/functions/service.sh
 
 global=0
-config_file="/etc/config/samba"
+config_file="/etc/config/samba4"
 
 wait_for_init() {
-    for i in `seq 30`
+	for i in `seq 30`
-    do
+	do
-        [ -e /tmp/procd.done ] || {
+		[ -e /tmp/procd.done ] || {
-            sleep 1; continue;
+		sleep 1; continue;
-        }
+		}
-        return
+		return
-    done
+	done
 }
 
 smb_handle() {
-        config_get path $1 path
+	config_get path $1 path
-        if [  "$path" = "$2" ] ;then
+	if [  "$path" = "$2" ] ;then
-                global=1
+		global=1
-        fi
+	fi
 }
 
 chk_en() {
@@ -34,67 +35,68 @@ chk_en() {
 	[ $autoshare -eq 0 ] && exit
 }
 
-config_load samba
+config_load samba4
-config_foreach chk_en samba
+config_foreach chk_en samba4
 
 device=`basename $DEVPATH`
 
 case "$ACTION" in
 	add)
-	
-        case "$device" in
-                sd*) ;;
-                md*) ;;
-                hd*);;     
-                mmcblk*);;  
-                *) return;;
-        esac   
-        
-        path="/dev/$device"
 
-        wait_for_init
+	case "$device" in
+		sd*);;
+		md*);;
+		hd*);;
+		mmcblk*);;
+		*) return;;
+	esac
 
-        cat /proc/mounts | while read j
+	path="/dev/$device"
-        do
-                str=${j%% *}
-                if [ "$str" == $path ];then
-                        strr=${j#* }
-                        target=${strr%% *}
-                        global=0
-                        config_foreach smb_handle sambashare $target
-						name=${target#*/mnt/}
 
-                        if [ $global -eq 0 ] ;then
+	wait_for_init
-                                echo -e "\n\nconfig sambashare" >> $config_file
+
-                                echo -e "\toption auto '1'" >> $config_file
+	cat /proc/mounts | grep -v '/boot\|/opt' | while read j
-                                echo -e "\toption name '$name'" >> $config_file
+	do
-                                echo -e "\toption path '$target'" >> $config_file
+		str=${j%% *}
-                                echo -e "\toption read_only 'no'" >> $config_file
+		if [ "$str" == $path ];then
-                                echo -e "\toption guest_ok 'yes'" >> $config_file
+			strr=${j#* }
-                                echo -e "\toption create_mask '0666'" >> $config_file
+			target=${strr%% *}
-                                echo -e "\toption dir_mask '0777'" >> $config_file
+			global=0
-								echo -e "\toption device '$device'" >> $config_file
+			config_foreach smb_handle sambashare $target
-				/etc/init.d/samba reload
+			name=${target#*/mnt/}
+
+			if [ $global -eq 0 ] ;then
+				echo -e "\n\nconfig sambashare" >> $config_file
+				echo -e "\toption auto '1'" >> $config_file
+				echo -e "\toption name '$name'" >> $config_file
+				echo -e "\toption path '$target'" >> $config_file
+				echo -e "\toption read_only 'no'" >> $config_file
+				echo -e "\toption guest_ok 'yes'" >> $config_file
+				echo -e "\toption create_mask '0666'" >> $config_file
+				echo -e "\toption dir_mask '0777'" >> $config_file
+				echo -e "\toption device '$device'" >> $config_file
+				echo -e "\toption inherit_owner 'yes'" >> $config_file
+				/etc/init.d/samba4 reload
 				return
-                        fi
+			fi
-                fi
+		fi
-        done
+	done
 	;;
+
 	remove)
 		i=0
 		while true
 		do
-
+			dev=`uci get samba4.@sambashare[$i].device`
-			dev=`uci get samba.@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`
+					mount_dir=`uci get samba4.@sambashare[$i].name`
-					uci delete samba.@sambashare[$i]
+					uci delete samba4.@sambashare[$i]
 					uci commit
-					/etc/init.d/samba reload
+					/etc/init.d/samba4 reload
 					return
 				}
 			}