samba: don't overwrite config file

fixes #19087

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 45220
This commit is contained in:
John Crispin 2015-04-01 13:39:23 +00:00
parent 04da950450
commit 26a27231e6

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=samba PKG_NAME:=samba
PKG_VERSION:=3.6.25 PKG_VERSION:=3.6.25
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \ PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
http://ftp.samba.org/pub/samba/stable http://ftp.samba.org/pub/samba/stable
@ -123,10 +123,14 @@ CONFIGURE_ARGS += \
MAKE_FLAGS += DYNEXP= PICFLAG= MODULES= MAKE_FLAGS += DYNEXP= PICFLAG= MODULES=
define Package/samba36-server/conffiles
/etc/config/samba
endef
define Package/samba36-server/install define Package/samba36-server/install
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba $(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) ./files/smb.conf.template $(1)/etc/samba
$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(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 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba