Skip to content

Commit

Permalink
Revert "samba36: add hotplug support"
Browse files Browse the repository at this point in the history
This reverts commit fd569e5.

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 <rosysong@rosinson.com>
Cc: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  • Loading branch information
Rafał Miłecki committed Dec 28, 2018
1 parent 3c899aa commit ae622c9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 114 deletions.
14 changes: 0 additions & 14 deletions package/network/services/samba36/Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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))

89 changes: 0 additions & 89 deletions package/network/services/samba36/files/lib/samba.sh

This file was deleted.

11 changes: 0 additions & 11 deletions package/network/services/samba36/files/samba.hotplug

This file was deleted.

0 comments on commit ae622c9

Please sign in to comment.