From patchwork Tue Dec 25 17:46:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1018425 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tx9x2T/z"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OoKp+n3K"; 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 43PNpq5yMzz9s8J for ; Wed, 26 Dec 2018 04:47:28 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=ENEIpo71+ctjidrIw2B+w3arEHj7VnA9CVu/XMocRxU=; b=tx9x2T/z913a2M dmhzRaPOKeJRpdB1P2fD9Llbyu4h7V1pSF6RA6Xetnk47QPTvQ2NRiwc9/VdSXi4uWAs5V5Jk9Lev 5vou59R4O5mbj3iJFNKjlYvabCAhcYbJKJTkTMZYlroEnJgf1qun5FgPT7Ib0znSz5U1fu/U8+ib/ q7g7WWT2rZ7KH+zuByUuT1QWVGwsloGUbPbYSjPid9uscLXvC2QQb/sxEn3Cxspg6ZVE6PKk/cKtl tfZ5mmPigO0XOXUp2B/bXkzCGs1NzYeAERoKydAMN6yapggiONdrLCQI1dlMdhNvh/Qy+oPBVXwrJ meywhyOmngM8I/yLO0qw==; 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 1gbqnU-0001r2-9L; Tue, 25 Dec 2018 17:47:16 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gbqnQ-0001qC-2u for openwrt-devel@lists.openwrt.org; Tue, 25 Dec 2018 17:47:14 +0000 Received: by mail-lj1-x242.google.com with SMTP id u89-v6so12436149lje.1 for ; Tue, 25 Dec 2018 09:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZxqKox8isidYDSoTwF/13AphjDCaeV1YnxRHFyxcCKs=; b=OoKp+n3Ksa6vbMxI74RF3q4sKqLg8SR4nDAJdJg3PyKm91YR7kmFsWxqBMI8/AaCZl giL8NGMvwSppKEEd6h7bXqpIlxoHhrvU9qoROe07vAHF19nGCMBKUGjriBvPBAi8pd7S S3yxqRB27B3bMBFhN7xS4n3tuRDerYjoxqkN/gTW+C5XO+afS0Wjc2Ix/ez9hH0Gl72d 8hiKqLTenJrMDHshr7IhQNX5QTsM2pnzh40HUSV0hdlgGVJwIZXaHjiBKSlv6EFdfR2x Ltm4IepgBNHtlq6y6NIf9eIWdL/R6J9T0ZiP+jLeeMKo+vHux4GGiPCYg6DZQog4WouJ YD0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZxqKox8isidYDSoTwF/13AphjDCaeV1YnxRHFyxcCKs=; b=XjbIJP6nrGlm7jPr++nIASYL4Uqi27cbkKnwyoC9onDqianmPbEnsLh4V/Ps/1Bxqv 7KXd75l2GOSZr9ig8B2mV9SA47CkASjaPHPE5lhRHikhnGAu7H0YMxYzd4PIlTHGkiKR wQFpkGNiFWJMVnyo//AYDagmUs6JnagW4dDzHpQZhsvkaYVFxiE3L8hpD7GZJWL5X8wj dpu/aswnVVQ6uoYtvisrH+y0LHUvT+BdnKjtz+S56vWGcacTKd6YXQE6864RO28bj0wx TZuH60Im8i8SKFd18AT3XCGJAdLb+L9I3LBvFxNoe/U02hrGOl/NFXhovzpYuMdsJWy8 AyEQ== X-Gm-Message-State: AJcUukdRmyE78c2MeGc28IhaJORDXb/iZY950jVlPJVJTV+3O/fY04hI ijKU2xQ/WVWu/p/dr0F3vq0DJhH+ X-Google-Smtp-Source: ALg8bN4+AsqfNTxR/5diSjOv6TfrfcCoH5U83numt5/qmhgUvWV49YkRbcaWoO0Zt29eMA6Gy++TXg== X-Received: by 2002:a2e:8945:: with SMTP id b5-v6mr6665952ljk.55.1545760017814; Tue, 25 Dec 2018 09:46:57 -0800 (PST) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id a11sm6754881lff.68.2018.12.25.09.46.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Dec 2018 09:46:56 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Tue, 25 Dec 2018 18:46:44 +0100 Message-Id: <20181225174644.16546-1-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181225_094712_158173_5B51C67B X-CRM114-Status: GOOD ( 10.43 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.3 URIBL_RHS_DOB Contains an URI of a new domain (Day Old Bread) [URIs: rosinson.com] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:242 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] Revert "samba36: add hotplug support" X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Jo-Philipp Wich , Rosy Song Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This reverts commit fd569e5e9d0a46ea957cb253e97a4b3ea8c2c540. After an extra review & discussion few concerns were raised regarding that feature: 1) It reacts to hotplug.d "block" events instead of more accurate (but currently unavailable) "mount" events. 2) It requires *something* to mount block device before samba hotplug.d gets fired. Otherwise samba_add_section() will just return. 3) It doesn't reload Samba which some users may expect 4) It operates on /etc/ which is not a right place for autogenerated ephemeral config. 5) It doesn't include any cleanup for non-existing shares. Cc: Rosy Song Cc: Jo-Philipp Wich Signed-off-by: Rafał Miłecki --- package/network/services/samba36/Makefile | 14 ---- .../network/services/samba36/files/lib/samba.sh | 89 ---------------------- .../network/services/samba36/files/samba.hotplug | 11 --- 3 files changed, 114 deletions(-) delete mode 100644 package/network/services/samba36/files/lib/samba.sh delete mode 100644 package/network/services/samba36/files/samba.hotplug diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index d38e942074..b63c2eaad3 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -43,12 +43,6 @@ define Package/samba36-server DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS) endef -define Package/samba36-hotplug - $(call Package/samba/Default) - TITLE+= hotplug - DEPENDS:=+block-mount -endef - define Package/samba36-client $(call Package/samba/Default) TITLE+= client @@ -167,13 +161,6 @@ define Package/samba36-server/install $(LN) samba_multicall $(1)/usr/sbin/smbpasswd endef -define Package/samba36-hotplug/install - $(INSTALL_DIR) $(1)/lib/samba - $(INSTALL_CONF) ./files/lib/samba.sh $(1)/lib/samba/samba.sh - $(INSTALL_DIR) $(1)/etc/hotplug.d/block - $(INSTALL_CONF) ./files/samba.hotplug $(1)/etc/hotplug.d/block/60-samba -endef - define Package/samba36-client/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_BIN)/smbclient $(1)/usr/sbin @@ -187,6 +174,5 @@ endef $(eval $(call BuildPackage,samba36-client)) $(eval $(call BuildPackage,samba36-server)) -$(eval $(call BuildPackage,samba36-hotplug)) $(eval $(call BuildPackage,samba36-net)) diff --git a/package/network/services/samba36/files/lib/samba.sh b/package/network/services/samba36/files/lib/samba.sh deleted file mode 100644 index a72a2a1933..0000000000 --- a/package/network/services/samba36/files/lib/samba.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2018 OpenWrt.org -# Copyright (C) 2018 rosysong@rosinson.com -# - -. /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 deleted file mode 100644 index 9c6dbe5e41..0000000000 --- a/package/network/services/samba36/files/samba.hotplug +++ /dev/null @@ -1,11 +0,0 @@ -. /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 samba