summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-01 20:40:05 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-01 20:40:05 +0100
commit33c84781ec8c0225472bd1bf00184efcdff3c20b (patch)
treef18fd9f4ad15d42c27e45be866cedd41e401bd9c
parentfd5c3b9c4adb01bf350b781498b4c9614f40dcf8 (diff)
use /sbin for watchdog binary
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/files/watchdog.init4
-rw-r--r--package/watchdog/Makefile8
-rw-r--r--package/watchdog/files/watchdog.init4
4 files changed, 9 insertions, 9 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 46752cb72..6145cb780 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.18.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c
PKG_DESCR:= Core utilities for embedded systems
PKG_SECTION:= base
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
index 5fadef046..1f1724da5 100644
--- a/package/busybox/files/watchdog.init
+++ b/package/busybox/files/watchdog.init
@@ -10,10 +10,10 @@ autostart)
exec sh $0 start
;;
start)
- /usr/sbin/watchdog $watchdog_flags /dev/watchdog
+ /sbin/watchdog $watchdog_flags /dev/watchdog
;;
stop)
- kill $(pgrep -f /usr/sbin/watchdog)
+ kill $(pgrep -f /sbin/watchdog)
;;
restart)
sh $0 stop
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index b1813a044..b2c4839f7 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= watchdog
PKG_VERSION:= 5.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d
PKG_DESCR:= watchdog daemon
PKG_SECTION:= utils
@@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
post-install:
- ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
+ ${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/
${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
- ${IDIR_WATCHDOG}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/sbin/watchdog \
+ ${IDIR_WATCHDOG}/sbin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init
index 6e104fbcf..60805546d 100644
--- a/package/watchdog/files/watchdog.init
+++ b/package/watchdog/files/watchdog.init
@@ -11,10 +11,10 @@ autostart)
exec sh $0 start
;;
start)
- /usr/sbin/watchdog
+ /sbin/watchdog
;;
stop)
- kill $(pgrep -f /usr/sbin/watchdog)
+ kill $(pgrep -f /sbin/watchdog)
;;
restart)
sh $0 stop