[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9e244b246b664b03850fdfe1200633b3df7d190b - IPFire-SCM

27 Apr 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  9e244b246b664b03850fdfe1200633b3df7d190b (commit)
       via  126507e5cf8c38e0b1932615394c3bee0687cd31 (commit)
       via  55f14706fb7f7b19459f960c4cb237881ab8620b (commit)
      from  ac28974f043769f6cf55d9b276b9beab67911e62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9e244b246b664b03850fdfe1200633b3df7d190b
Merge: 126507e ac28974
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 27 19:38:05 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit 126507e5cf8c38e0b1932615394c3bee0687cd31
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 27 19:37:42 2014 +0200
watchdog: Update addon.
commit 55f14706fb7f7b19459f960c4cb237881ab8620b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Apr 26 13:22:49 2014 +0200
kernel: Enable various watchdog modules on i586.
-----------------------------------------------------------------------
Summary of changes:
 config/backup/includes/watchdog             |  1 +
 config/kernel/kernel.config.i586-ipfire     | 30 ++++++++---------
 config/kernel/kernel.config.i586-ipfire-pae | 28 ++++++++--------
 lfs/watchdog                                |  8 ++---
 src/initscripts/init.d/watchdog             | 50 +++++++++++------------------
 5 files changed, 53 insertions(+), 64 deletions(-)
Difference in files:

diff --git a/config/backup/includes/watchdog b/config/backup/includes/watchdog
index 3ef1359..fe7a567 100644
--- a/config/backup/includes/watchdog
+++ b/config/backup/includes/watchdog
@@ -1 +1,2 @@
+/etc/sysconfig/watchdog
 /etc/watchdog.conf
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index a50a248..2824018 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3052,37 +3052,37 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
-# CONFIG_SC520_WDT is not set
+CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-# CONFIG_EUROTECH_WDT is not set
+CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-# CONFIG_WAFER_WDT is not set
+CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
-# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
-# CONFIG_SC1200_WDT is not set
-# CONFIG_SCx200_WDT is not set
-# CONFIG_PC87413_WDT is not set
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_CPU5_WDT is not set
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
-# CONFIG_SMSC37B787_WDT is not set
+CONFIG_SMSC37B787_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
@@ -3090,7 +3090,7 @@ CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_SBC_EPX_C3_WATCHDOG=m
#
 # ISA-based Watchdog Cards
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index a116122..d8f452c 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -3071,36 +3071,36 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
-# CONFIG_SC520_WDT is not set
+CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-# CONFIG_EUROTECH_WDT is not set
+CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-# CONFIG_WAFER_WDT is not set
+CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
-# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
-# CONFIG_SC1200_WDT is not set
-# CONFIG_PC87413_WDT is not set
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_CPU5_WDT is not set
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
-# CONFIG_SMSC37B787_WDT is not set
+CONFIG_SMSC37B787_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
@@ -3108,7 +3108,7 @@ CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_XEN_WDT=m
#
diff --git a/lfs/watchdog b/lfs/watchdog
index 8058c8c..70bf692 100644
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -24,7 +24,7 @@
include Config
-VER        = 5.9
+VER        = 5.13
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
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d7cae3c9829f5d9a680764f314234867
+$(DL_FILE)_MD5 = 153455f008f1cf8f65f6ad9586a21ff1
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)
-	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 \
diff --git a/src/initscripts/init.d/watchdog b/src/initscripts/init.d/watchdog
index 6d15775..a21949a 100644
--- a/src/initscripts/init.d/watchdog
+++ b/src/initscripts/init.d/watchdog
@@ -1,44 +1,31 @@
 #!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/watchdog
+#
+# Description : watchdog daemon initscript
+#
+########################################################################
. /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)
-		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)
-		boot_mesg "Stopping watchdog ..."
-		killproc $DAEMON
+		boot_mesg "Stopping watchdog daemon..."
+		killproc /usr/sbin/watchdog
    	;;
restart)
@@ -48,7 +35,7 @@ case "${1}" in
    	;;
status)
-		statusproc $DAEMON
+		statusproc /usr/sbin/watchdog
    	;;
*)
@@ -57,3 +44,4 @@ case "${1}" in
    	;;
 esac
+# End $rc_base/init.d/watchdog
hooks/post-receive
--
IPFire 2.x development tree

    