From patchwork Thu Apr 12 09:41:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosy Song X-Patchwork-Id: 897579 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rosinson.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mqaD4t+u"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MGCy2j9Bz9s1R for ; Thu, 12 Apr 2018 19:42:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=asyaYFQnN+W3iFT4VunQnyp4DoDzCQ0u+Jyj2wxE8Uo=; b=mqaD4t+uk50QZB 1kiZW1ZznwcB2YdMkTLJc5ygibWAaAAe1ZyPhqVDNBRdSFRP/ZEZwiR1jKB3zczZFV0g4Ys69SWS0 Hx2HOhnCdtNwgB33f4oELB67QwwxdTsxf93kbDBjVYT+iVkh8xIjfhc+Gj6C4V/FlBCv/PfeO9E8w GO8hM17lJNCfgLuOOMNPJQC3s058+/vr4gQYk7cRk9W2bjCLtk4e9RXzlI9ogipvk2WZmirN8FYEZ iFpAqhp1FIYrv60Dd3Ea0Ru5xEKMthc+STZU/j7i20PB7Ia5vhDNYJdNq1N7SvQEX0FY1BR6DlqCj tr/Zat6jbiGRWxNqiEBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YkU-0001ZA-GA; Thu, 12 Apr 2018 09:42:34 +0000 Received: from out20-63.mail.aliyun.com ([115.124.20.63]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YkI-0001Wl-Gt for lede-dev@lists.infradead.org; Thu, 12 Apr 2018 09:42:32 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.06445917|-1; CH=green; FP=11296884365186331361|1|1|1|0|-1|-1|-1; HT=e02c03292; MF=rosysong@rosinson.com; NM=1; PH=DS; RN=2; RT=2; SR=0; TI=SMTPD_---.BfCnqVw_1523526118; Received: from localhost.localdomain(mailfrom:rosysong@rosinson.com fp:SMTPD_---.BfCnqVw_1523526118) by smtp.aliyun-inc.com(10.147.41.231); Thu, 12 Apr 2018 17:41:59 +0800 From: Rosy Song To: lede-dev@lists.infradead.org Date: Thu, 12 Apr 2018 17:41:03 +0800 Message-Id: <20180412094103.3200-1-rosysong@rosinson.com> X-Mailer: git-send-email 2.13.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_024222_725142_DC14B88A X-CRM114-Status: GOOD ( 10.14 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [115.124.20.63 listed in list.dnswl.org] 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Subject: [LEDE-DEV] [PATCH] samba36: add hotplug script X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosy Song MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add hotplug handle script for storage devices, this will add corresponding option in the /etc/config/samba file automatically. If user do not want this feature, it can be cancel via samba relevant menu option. Signed-off-by: Rosy Song --- package/network/services/samba36/Makefile | 11 +++ .../network/services/samba36/files/lib/samba.sh | 83 ++++++++++++++++++++++ .../network/services/samba36/files/samba.hotplug | 11 +++ 3 files changed, 105 insertions(+) create mode 100644 package/network/services/samba36/files/lib/samba.sh create mode 100644 package/network/services/samba36/files/samba.hotplug diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index 30e26195ff..19e69a785f 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -60,6 +60,11 @@ define Package/samba36-server/config int "Maximum level of compiled-in debug messages" depends on PACKAGE_samba36-server || PACKAGE_samba36-client default -1 + config PACKAGE_SAMBA_SERVER_HOTPLUG + bool "Hotplug script of autoshare" + depends on PACKAGE_samba36-server + select PACKAGE_block-mount + default n endef define Package/samba36-server/description @@ -147,6 +152,12 @@ define Package/samba36-server/install $(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba $(INSTALL_DIR) $(1)/etc/samba $(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba +ifeq ($(CONFIG_PACKAGE_SAMBA_SERVER_HOTPLUG),y) + $(INSTALL_DIR) $(1)/lib/samba + $(INSTALL_DATA) ./files/lib/samba.sh $(1)/lib/samba/samba.sh + $(INSTALL_DIR) $(1)/etc/hotplug.d/block + $(INSTALL_DATA) ./files/samba.hotplug $(1)/etc/hotplug.d/block/60-samba +endif $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba diff --git a/package/network/services/samba36/files/lib/samba.sh b/package/network/services/samba36/files/lib/samba.sh new file mode 100644 index 0000000000..f5e37b09b5 --- /dev/null +++ b/package/network/services/samba36/files/lib/samba.sh @@ -0,0 +1,83 @@ +. /lib/functions.sh + +FLAG_DEV_TYPE= +FLAG_DEV_MOPT= +FLAG_HAS_SECT= + +samba_dev_filter() { # <[path,/dev/]> + case $1 in + ${2}mtdblock*|\ + ${2}ubi*) + FLAG_DEV_TYPE="mtd" + ;; + ${2}loop*|\ + ${2}mmcblk*|\ + ${2}sd*|\ + ${2}hd*|\ + ${2}md*|\ + ${2}nvme*|\ + ${2}vd*|\ + ${2}xvd*) + FLAG_DEV_TYPE="not-mtd" + ;; + *) + [ -b ${2}${1} ] && FLAG_DEV_TYPE="not-mtd" + [ -b /dev/mapper/$1 ] && FLAG_DEV_TYPE="not-mtd" + ;; + esac +} + +samba_cfg_lookup() { #
+ config_get name $1 name + [ "$name" = "$2" ] || return + FLAG_HAS_SECT=y +} + +samba_cfg_delete() { #
+ config_get name $1 name + [ "$name" = "$2" ] || return + uci -q delete samba.$1 +} + +samba_find_mount_point() { # + # search mount point in /proc/mounts + while read l; do + local d=$(echo $l | awk '/^\/dev/ {print $1}') + [ "$d" = "/dev/$1" ] || continue + + FLAG_DEV_MOPT=$(echo $l | awk '/^\/dev/ {print $2}') + break + done < /proc/mounts +} + +_samba_add_section() { # + uci -q batch <<-EOF + add samba sambashare + set samba.@sambashare[-1].browseable='yes' + set samba.@sambashare[-1].name='$1' + set samba.@sambashare[-1].path='$2' + set samba.@sambashare[-1].users='root' + set samba.@sambashare[-1].read_only='no' + set samba.@sambashare[-1].guest_ok='yes' + set samba.@sambashare[-1].create_mask='0755' + set samba.@sambashare[-1].dir_mask='0755' + EOF +} + +samba_add_section() { # [] + FLAG_HAS_SECT= + FLAG_DEV_MOPT= + + config_foreach samba_cfg_lookup sambashare $1 + [ -z "$FLAG_HAS_SECT" ] || return + + samba_find_mount_point $1 + [ -n "$FLAG_DEV_MOPT" ] || return + + [ -n "$2" -a "$2" = "$FLAG_DEV_MOPT" ] || \ + _samba_add_section $1 $FLAG_DEV_MOPT +} + +samba_delete_section() { # + config_foreach samba_cfg_delete sambashare $1 +} diff --git a/package/network/services/samba36/files/samba.hotplug b/package/network/services/samba36/files/samba.hotplug new file mode 100644 index 0000000000..d4c8e7c5f5 --- /dev/null +++ b/package/network/services/samba36/files/samba.hotplug @@ -0,0 +1,11 @@ +. /lib/samba/samba.sh + +samba_dev_filter $DEVNAME +[ "$FLAG_DEV_TYPE" = "not-mtd" ] || exit + +config_load samba +case $ACTION in + add) samba_add_section $DEVNAME;; + remove) samba_delete_section $DEVNAME;; +esac +uci commit