Browse Source

use /sbin for watchdog binary

Waldemar Brodkorb 13 years ago
parent
commit
33c84781ec

+ 1 - 1
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

+ 2 - 2
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

+ 4 - 4
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

+ 2 - 2
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