watchdog: Update addon.

diff --git a/config/backup/includes/watchdog b/config/backup/includes/watchdog
index 3ef13592a04146e42e459207c8baa44cb1187396..fe7a567886198dda072c30316652c5865a6706fb 100644 (file)
--- a/config/backup/includes/watchdog
+++ b/config/backup/includes/watchdog
@@ -1 +1,2 @@
+/etc/sysconfig/watchdog

 /etc/watchdog.conf
 /etc/watchdog.conf

diff --git a/lfs/watchdog b/lfs/watchdog
index 8058c8cbe34c85d106ba75e1db109a4474b5dc34..70bf6921ea5ae6ea5487a95db9828a9714ddfb08 100644 (file)
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -24,7 +24,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 5.9
+VER        = 5.13

 
 THISAPP    = watchdog-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = watchdog-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = watchdog
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = watchdog

-PAK_VER    = 3
+PAK_VER    = 4

 
 DEPS       = ""
 
 
 DEPS       = ""
 


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = d7cae3c9829f5d9a680764f314234867
+$(DL_FILE)_MD5 = 153455f008f1cf8f65f6ad9586a21ff1

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && ./configure
+       cd $(DIR_APP) && ./configure --prefix=/usr

        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \

diff --git a/src/initscripts/init.d/watchdog b/src/initscripts/init.d/watchdog
index 6d15775f498f50feafa139e9ddf2639f9d3356c6..a21949ad7316658140d830e97ce3791d8c959761 100644 (file)
--- a/src/initscripts/init.d/watchdog
+++ b/src/initscripts/init.d/watchdog
@@ -1,44 +1,31 @@
 #!/bin/sh
 #!/bin/sh

+########################################################################
+# Begin $rc_base/init.d/watchdog
+#
+# Description : watchdog daemon initscript
+#
+########################################################################

 
 . /etc/sysconfig/rc
 . ${rc_functions}
 
 
 . /etc/sysconfig/rc
 . ${rc_functions}
 

-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-test -x /usr/sbin/watchdog || exit 0
-
-# For configuration of the init script use the file
-# /etc/sysconfig/watchdog, do not edit this init script.
-
-# Set run_watchdog to 1 to start watchdog or 0 to disable it.
-run_watchdog=0
-
-# Specify additional watchdog options here (see manpage).
-watchdog_options=""
-
-# Specify module to load
-watchdog_module="none"
-
-[ -e /etc/sysconfig/watchdog ] && . /etc/sysconfig/watchdog
-
-DAEMON=/usr/sbin/watchdog
-WD_DAEMON=/usr/sbin/wd_keepalive
+if [ -e "/etc/sysconfig/watchdog" ]; then
+       . /etc/sysconfig/watchdog
+fi

 
 case "${1}" in
        start)
 
 case "${1}" in
        start)

-               boot_mesg "Starting watchdog ..."
-               if [ $run_watchdog = 1 ]
-               then
-                       # do we have to load a module?
-                       [ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module
-
-                       loadproc $DAEMON $watchdog_options
-               fi
+               if [ -n "${watchdog_module}" ]; then
+                       modprobe -q "${watchdog_module}" 2>/dev/null
+               fi
+
+               boot_mesg "Starting watchdog daemon..."
+               loadproc /usr/sbin/watchdog ${watchdog_options}

                ;;
 
        stop)
                ;;
 
        stop)

-               boot_mesg "Stopping watchdog ..."
-               killproc $DAEMON
+               boot_mesg "Stopping watchdog daemon..."
+               killproc /usr/sbin/watchdog

                ;;
 
        restart)
                ;;
 
        restart)


@@ -48,7 +35,7 @@ case "${1}" in
                ;;
 
        status)
                ;;
 
        status)

-               statusproc $DAEMON
+               statusproc /usr/sbin/watchdog

                ;;
 
        *)
                ;;
 
        *)


@@ -57,3 +44,4 @@ case "${1}" in
                ;;
 esac
 
                ;;
 esac
 

+# End $rc_base/init.d/watchdog