summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-20 17:07:08 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-20 17:07:08 +0000
commit11adc3d3d99be025a29ea320b1142104f2f1e0f8 (patch)
tree5c2d45388aac8e89f9bdb2cbde76b43f6bd99339
parent1f8108678df8fdee9a3f3e92aafa211b66974859 (diff)
[package] base-files: only try to execute watchdog if binary is present
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18102 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/watchdog3
2 files changed, 3 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0fdbf11391..68cebfed73 100644
--- 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 adb8f57c13..861a1f9eb0 100755
--- 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
}