base-files: only try to execute watchdog if binary is present

SVN-Revision: 18102

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0fdbf113911707c587f25e2e1519e9b25e8d52b1..68cebfed731424bae7ba66a4a3ba3821dc372826 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=32
+PKG_RELEASE:=33
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 

diff --git a/package/base-files/files/etc/init.d/watchdog b/package/base-files/files/etc/init.d/watchdog
index adb8f57c1393a291356237961a5bdb1a19b1fa5b..861a1f9eb04d412c09bf376e83503183aa9fe846 100755 (executable)
--- a/package/base-files/files/etc/init.d/watchdog
+++ b/package/base-files/files/etc/init.d/watchdog
@@ -3,5 +3,6 @@
 
 START=97
 start() {
-        [ -c /dev/watchdog ] && watchdog -t 5 /dev/watchdog
+        [ -c /dev/watchdog ] && [ -x /sbin/watchdog ] && \
+               watchdog -t 5 /dev/watchdog
 }