contrib/package/freifunk-watchdog: don't kill watchdog daemon before sysupgrade,...

diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index 4876a94de13077942436e04d0257d54915133d8d..e3ff674010325507a659955725b2d5c02a34911b 100644 (file)
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/contrib/package/freifunk-watchdog/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-watchdog
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := uci
@@ -48,8 +48,6 @@ define Package/freifunk-watchdog/install
        $(INSTALL_BIN) ./files/freifunk-watchdog.init $(1)/etc/init.d/freifunk-watchdog
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ffwatchd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/lib/upgrade
-       $(INSTALL_DATA) ./files/sysupgrade.hook $(1)/lib/upgrade/kill-ffwatchd.sh
 endef
 
 $(eval $(call BuildPackage,freifunk-watchdog))

diff --git a/contrib/package/freifunk-watchdog/files/sysupgrade.hook b/contrib/package/freifunk-watchdog/files/sysupgrade.hook
deleted file mode 100644 (file)
index e124c39..0000000
--- a/contrib/package/freifunk-watchdog/files/sysupgrade.hook
+++ /dev/null
@@ -1,7 +0,0 @@
-kill_freifunk_watchdog() {
-       v "Terminating ffwatchd..."
-       killall ffwatchd
-       killall crond
-}
-
-export sysupgrade_pre_upgrade="${sysupgrade_pre_upgrade:+$sysupgrade_pre_upgrade }kill_freifunk_watchdog"