diff mbox

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

Message ID 1447258435-21646-4-git-send-email-stijn@linux-ipv6.be
State Changes Requested
Headers show

Commit Message

Stijn Tintel Nov. 11, 2015, 4:13 p.m. UTC
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 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

Comments

Jo-Philipp Wich Nov. 11, 2015, 4:38 p.m. UTC | #1
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
diff mbox

Patch

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 0000000..bcff8a2
--- /dev/null
+++ b/package/network/utils/conntrack-tools/files/conntrackd.upgrade
@@ -0,0 +1 @@ 
+/etc/conntrackd/