Re: [OpenWrt-Devel] [PATCH 4/4] conntrack-tools: preserve /etc/conntrackd during upgrade

[Jo-Philipp Wich]

Hi,

> + $(INSTALL_DATA) ./files/conntrackd.upgrade 
> $(1)/lib/upgrade/keep.d/conntrackd

please don't ship keep.d files manually, use the define
Package/.../conffile macro (yes it works for directories as well).


~ Jow



signature.asc
Description: OpenPGP digital signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH 4/4] conntrack-tools: preserve /etc/conntrackd during upgrade

[Stijn Tintel]

Signed-off-by: Stijn Tintel 
---
 package/network/utils/conntrack-tools/Makefile | 2 ++
 package/network/utils/conntrack-tools/files/conntrackd.upgrade | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 
package/network/utils/conntrack-tools/files/conntrackd.upgrade

diff --git a/package/network/utils/conntrack-tools/Makefile 
b/package/network/utils/conntrack-tools/Makefile
index 51d3c41..a7a28f2 100644
--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -71,9 +71,11 @@ define Package/conntrackd/install
$(INSTALL_DIR) \
$(1)/etc/conntrackd \
$(1)/etc/init.d \
+   $(1)/lib/upgrade/keep.d \
$(1)/usr/sbin
$(INSTALL_BIN)  $(PKG_INSTALL_DIR)/usr/sbin/conntrackd $(1)/usr/sbin/
$(INSTALL_BIN) ./files/conntrackd.init $(1)/etc/init.d/conntrackd
+   $(INSTALL_DATA) ./files/conntrackd.upgrade 
$(1)/lib/upgrade/keep.d/conntrackd
 endef
 
 $(eval $(call BuildPackage,conntrack))
diff --git a/package/network/utils/conntrack-tools/files/conntrackd.upgrade 
b/package/network/utils/conntrack-tools/files/conntrackd.upgrade
new file mode 100644
index 000..bcff8a2
--- /dev/null
+++ b/package/network/utils/conntrack-tools/files/conntrackd.upgrade
@@ -0,0 +1 @@
+/etc/conntrackd/
-- 
2.4.6
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel