aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-04-01 13:39:23 +0000
committerJohn Crispin <john@openwrt.org>2015-04-01 13:39:23 +0000
commit26a27231e6a65300250c0b40c2178664fda6765a (patch)
tree1e770d91572e1ad3c2c21ef2bec710529b0306be /package/network/services
parent04da9504508a1ff57ce2017d93ac709b12f95c67 (diff)
downloadupstream-26a27231e6a65300250c0b40c2178664fda6765a.tar.gz
upstream-26a27231e6a65300250c0b40c2178664fda6765a.tar.bz2
upstream-26a27231e6a65300250c0b40c2178664fda6765a.zip
samba: don't overwrite config file
fixes #19087 Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 45220
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/samba36/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 70dfb2b16f..a3daf58d55 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=samba
PKG_VERSION:=3.6.25
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
http://ftp.samba.org/pub/samba/stable
@@ -123,10 +123,14 @@ CONFIGURE_ARGS += \
MAKE_FLAGS += DYNEXP= PICFLAG= MODULES=
+define Package/samba36-server/conffiles
+/etc/config/samba
+endef
+
define Package/samba36-server/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba
- $(INSTALL_DIR) $(1)/etc/samba
+ $(INSTALL_CONF) $(1)/etc/samba
$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba