Author: blogic Date: 2015-04-01 15:39:23 +0200 (Wed, 01 Apr 2015) New Revision: 45220
Modified: trunk/package/network/services/samba36/Makefile Log: samba: don't overwrite config file fixes #19087 Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/network/services/samba36/Makefile =================================================================== --- trunk/package/network/services/samba36/Makefile 2015-04-01 13:36:58 UTC (rev 45219) +++ trunk/package/network/services/samba36/Makefile 2015-04-01 13:39:23 UTC (rev 45220) @@ -9,7 +9,7 @@ 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 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
