diff options
| author | John Crispin <blogic@openwrt.org> | 2015-04-01 13:39:23 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-04-01 13:39:23 +0000 |
| commit | 7c9221cfe3a141901701fafd3d9c932812966d1c (patch) | |
| tree | f5b1efb72e11f9ed5d2384435362cf2f5aebbfca /package/network/services/samba36 | |
| parent | 7880d249b08e19e89fc8bf86b0fb370caa6070f1 (diff) | |
| download | master-187ad058-7c9221cfe3a141901701fafd3d9c932812966d1c.tar.gz master-187ad058-7c9221cfe3a141901701fafd3d9c932812966d1c.tar.bz2 master-187ad058-7c9221cfe3a141901701fafd3d9c932812966d1c.zip | |
samba: don't overwrite config file
fixes #19087
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45220 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/samba36')
| -rw-r--r-- | package/network/services/samba36/Makefile | 8 |
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 |