From 62628c66fa542ccf9c7a47a45aa59364c27caf54 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Mon, 26 Nov 2018 00:10:44 +0100 Subject: [PATCH] fixes for latest 3.41.xx CCU firmware changes. --- README.md | 8 ++++---- VERSION | 2 +- common/bin/hm-watchdog.sh | 18 ++++++++++-------- www/update-check.cgi | 1 + 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index daf77a3..54b43ec 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,10 @@ A HomeMatic CCU Addon package implementing a software watchdog functionality to * udevd * sshd * crond - * RaspberryMatic: rngd - * RaspberryMatic: irqbalance - * RaspberryMatic: dbus - * RaspberryMatic: snmpd + * CCU3/RaspberryMatic: rngd + * CCU3/RaspberryMatic: irqbalance + * CCU3/RaspberryMatic: dbus + * CCU3/RaspberryMatic: snmpd - third-party services: * CUxD * automatically reboots CCU device if one of the services failed 3 times in a row diff --git a/VERSION b/VERSION index eb49d7c..aec258d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7 +0.8 diff --git a/common/bin/hm-watchdog.sh b/common/bin/hm-watchdog.sh index 1b3fa5c..bdd2fe9 100755 --- a/common/bin/hm-watchdog.sh +++ b/common/bin/hm-watchdog.sh @@ -132,19 +132,19 @@ fi # check udevd (ALL: /etc/init.d/S10udev) check_service "udev" "udevd" -# check irqbalance (RaspberryMatic: /etc/init.d/S13irqbalance) +# check irqbalance (CCU3/RaspberryMatic: /etc/init.d/S13irqbalance) check_service "irqbalance" -# check rngd (RaspberryMatic: /etc/init.d/S21rngd) +# check rngd (CCU3/RaspberryMatic: /etc/init.d/S21rngd) check_service "rngd" -# check dbus (RaspberryMatic: /etc/init.d/S30dbus) +# check dbus (CCU3/RaspberryMatic: /etc/init.d/S30dbus) check_service "dbus" # check ifplugd (ALL: /etc/init.d/S45ifplugd) check_service "ifplugd" -# check ntpd (RaspberryMatic: /etc/init.d/S48ntp) +# check ntpd (CCU3/RaspberryMatic: /etc/init.d/S48ntp) if [[ -x /etc/init.d/S??ntp ]] && [[ -e /etc/config/ntpclient ]] && [[ -e /var/status/hasNTP ]]; then check_service "ntp" "ntpd" @@ -156,7 +156,7 @@ if [[ -x /etc/init.d/S??SetClock ]] && check_service "SetClock" "ntpclient" fi -# check for ssdpd (RaspberryMatic: /etc/init.d/S50ssdpd) +# check for ssdpd (CCU3/RaspberryMatic: /etc/init.d/S50ssdpd) check_service "ssdpd" # check for eq3configd (ALL: /etc/init.d/S50eq3configd) @@ -178,8 +178,10 @@ fi # check CUxD (if present: /etc/init.d/S55cuxd) check_service "cuxd" -# check snmpd (RaspberryMatic: /etc/init.d/S59snmpd) -check_service "snmpd" +# check snmpd (CCU3/RaspberryMatic: /etc/init.d/S59snmpd) +if [[ -e /etc/config/snmp/snmpd-ccu3.conf ]]; then + check_service "snmpd" +fi # check hs485d (ALL: /etc/init.d/S60hs485d) if grep -q BidCos-Wired /etc/config/InterfacesList.xml; then @@ -207,5 +209,5 @@ fi # check for the ReGaHss (ALL: /etc/init.d/S70ReGaHss) check_service "ReGaHss" -# check crond (RaspberryMatic: /etc/init.d/S71crond) +# check crond (CCU3/RaspberryMatic: /etc/init.d/S71crond) check_service "crond" diff --git a/www/update-check.cgi b/www/update-check.cgi index 91b5ea2..b1c97d8 100755 --- a/www/update-check.cgi +++ b/www/update-check.cgi @@ -17,6 +17,7 @@ if { [info exists cmd ] && $cmd == "download"} { puts -nonewline "Content-Type: text/html; charset=utf-8\r\n\r\n" puts -nonewline "" } else { + puts -nonewline "Content-Type: text/plain; charset=utf-8\r\n\r\n" catch { set newversion [ exec /usr/bin/wget -qO- --no-check-certificate $checkURL ] }