lede-packages-rs

commit f95647218a5571b8e815589b22606a23403b20d1
parent fb2d0feb0b023f62fd34f79abcf39359530d8091
Author: Ted Hess <thess@kitschensync.net>
Date:   Fri, 16 Sep 2016 17:48:48 -0400

Merge pull request #3092 from ascob/watchcat

watchcat: fix operation of mode 'always'
Diffstat:
M
utils/watchcat/Makefile
 | 
2
+-
M
utils/watchcat/files/initd_watchcat
 | 
4
+---

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/utils/watchcat/Makefile b/utils/watchcat/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=watchcat
 PKG_VERSION:=1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 PKG_LICENSE:=GPL-2.0
diff --git a/utils/watchcat/files/initd_watchcat b/utils/watchcat/files/initd_watchcat
@@ -50,7 +50,7 @@ load_watchcat() {
 			pingperiod="$seconds"
 			if [ "$pingperiod" -ge 0 ]
 			then
-				[ "$pingperiod" -le "$period" ] \
+				[ "$pingperiod" -lt "$period" ] \
 					|| append_string "error" "pingperiod must be less than period" "; "
 			else
 				append_string "error" 'pingperiod is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
@@ -59,8 +59,6 @@ load_watchcat() {
 			pingperiod="$((period/20))"
 		fi
 	}
-	[ "$pingperiod" -lt "$period" -o "$mode" = "always" ] \
-		|| append_string "error" "pingperiod is not recognized" "; "
 	[ "$forcedelay" -ge 0 ] \
 		|| append_string "error" "forcedelay must be a integer greater or equal than 0, where 0 means disabled" "; "