Changeset 73909b3 in freewrt

Timestamp:

Oct 14, 2006, 7:03:23 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

54848b1

Parents:

f8a4dc3

Message:

cleanup watchdog init script

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@909 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/watchdog

Files:

• Makefile (modified) (2 diffs)
• files/watchdog.init (modified) (1 diff)
• ipkg/watchdog.postinst (added)

package/watchdog/Makefile

@@ -9 +9 @@
 PKG_NAME:=              watchdog
 PKG_VERSION:=           5.2.4
-PKG_RELEASE:=           1
+PKG_RELEASE:=           2
 PKG_MD5SUM:=            c6ac132d92110eb2c4670d4f684105c3
+PKG_INIT:=              15
 
 PKG_SOURCE_URL:=        http://ftp.debian.org/debian/pool/main/w/watchdog
@@ -65 +66 @@
         $(CP) $(WRKINST)/etc/watchdog.conf $(IDIR_WATCHDOG)/etc/
         install -d -m0755 $(IDIR_WATCHDOG)/etc/init.d
-        install -m0755 ./files/watchdog.init $(IDIR_WATCHDOG)/etc/init.d/watchdog
-        ln -sf watchdog $(IDIR_WATCHDOG)/etc/init.d/S90watchdog
+        install -m0755 ./files/watchdog.init \
+                $(IDIR_WATCHDOG)/etc/init.d/S$(PKG_INIT)watchdog
         install -d -m0755 $(IDIR_WATCHDOG)/usr/sbin
         $(CP) $(WRKINST)/usr/sbin/watchdog $(IDIR_WATCHDOG)/usr/sbin/

package/watchdog/files/watchdog.init

@@ -1 +1 @@
 #!/bin/sh
 
-RUN_D=/var/run
-PID_F=$RUN_D/watchdog.pid
+. /etc/rc.conf 
 
 case $1 in
-autostart|start)
-  /usr/sbin/watchdog
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
+        autostart)
+                test x"${watchdog:-NO}" = x"NO" && exit 0
+                exec $0 start
+                ;;
+        start)
+                /usr/sbin/watchdog
+                ;;
+        stop)
+                killall watchdog
+                ;;
+        restart)
+                $0 stop
+                $0 start
+                ;;
+        *)
+                echo "usage: $0 { start | stop | restart }"
+                exit 1
 esac
-
 exit $?