From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 19 May 2016 08:25:11 +0000 (+0200)
Subject: Revert "dnsmasq: sysupgrade hook to conditionally preserve dnsmasq.time"
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Flynxis%2Fomap.git;a=commitdiff_plain;h=85a59127a77801b12b8c5d3e4f53d19b5a3b2871

Revert "dnsmasq: sysupgrade hook to conditionally preserve dnsmasq.time"

This reverts commit d830cb08826dc593406d9003d061016061b6c3c4.

Reverting this commit due to a missing Signed-off-by.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index f0aba1af44..3f12a40cd3 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -151,8 +151,6 @@ $(call Package/dnsmasq/install,$(1))
 ifneq ($(CONFIG_PACKAGE_dnsmasq_full_dnssec),)
 	$(INSTALL_DIR) $(1)/usr/share/dnsmasq
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/trust-anchors.conf $(1)/usr/share/dnsmasq
-	$(INSTALL_DIR) $(1)/lib/upgrade
-	$(INSTALL_BIN) ./files/dnsmasqsec-add-conffiles.sh $(1)/lib/upgrade
 endif
 endef
 
diff --git a/package/network/services/dnsmasq/files/dnsmasqsec-add-conffiles.sh b/package/network/services/dnsmasq/files/dnsmasqsec-add-conffiles.sh
deleted file mode 100644
index 116ab5f8cf..0000000000
--- a/package/network/services/dnsmasq/files/dnsmasqsec-add-conffiles.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-add_dnsmasqsec_conffiles()
-{
-	local filelist="$1"
-
-	# do NOT include timestamp in a backup, only system upgrade
-	# dnsmasq restart ensures file timestamp is up to date
-	if [ -z $NEED_IMAGE ]; then
-		if [ $(ubus call service list '{"name":"dnsmasq"}' | jsonfilter -e '@.*.instances.instance1.running') = "true" ]; then
-			/etc/init.d/dnsmasq restart
-			sleep 1
-			echo "/etc/dnsmasq.time" >>$filelist
-		fi
-	fi
-}
-
-sysupgrade_init_conffiles="$sysupgrade_init_conffiles add_dnsmasqsec_conffiles"