From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9e244b246b664b03850fdfe1200633b3df7d190b Date: Sun, 27 Apr 2014 19:38:13 +0200 Message-ID: <20140427173813.F2F07212B3@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1021311463861458551==" List-Id: --===============1021311463861458551== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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 Date: Sun Apr 27 19:37:42 2014 +0200 watchdog: Update addon. commit 55f14706fb7f7b19459f960c4cb237881ab8620b Author: Michael Tremer 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.c= onfig.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=3Dy # CONFIG_SOFT_WATCHDOG=3Dm CONFIG_RETU_WATCHDOG=3Dm -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set +CONFIG_ACQUIRE_WDT=3Dm +CONFIG_ADVANTECH_WDT=3Dm CONFIG_ALIM1535_WDT=3Dm CONFIG_ALIM7101_WDT=3Dm CONFIG_F71808E_WDT=3Dm CONFIG_SP5100_TCO=3Dm CONFIG_GEODE_WDT=3Dm -# CONFIG_SC520_WDT is not set +CONFIG_SC520_WDT=3Dm CONFIG_SBC_FITPC2_WATCHDOG=3Dm -# CONFIG_EUROTECH_WDT is not set +CONFIG_EUROTECH_WDT=3Dm CONFIG_IB700_WDT=3Dm CONFIG_IBMASR=3Dm -# CONFIG_WAFER_WDT is not set +CONFIG_WAFER_WDT=3Dm CONFIG_I6300ESB_WDT=3Dm CONFIG_IE6XX_WDT=3Dm CONFIG_ITCO_WDT=3Dm -# CONFIG_ITCO_VENDOR_SUPPORT is not set +CONFIG_ITCO_VENDOR_SUPPORT=3Dy CONFIG_IT8712F_WDT=3Dm CONFIG_IT87_WDT=3Dm CONFIG_HP_WATCHDOG=3Dm CONFIG_HPWDT_NMI_DECODING=3Dy -# CONFIG_SC1200_WDT is not set -# CONFIG_SCx200_WDT is not set -# CONFIG_PC87413_WDT is not set +CONFIG_SC1200_WDT=3Dm +CONFIG_SCx200_WDT=3Dm +CONFIG_PC87413_WDT=3Dm CONFIG_NV_TCO=3Dm -# 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=3Dm +CONFIG_SBC8360_WDT=3Dm +CONFIG_SBC7240_WDT=3Dm +CONFIG_CPU5_WDT=3Dm CONFIG_SMSC_SCH311X_WDT=3Dm -# CONFIG_SMSC37B787_WDT is not set +CONFIG_SMSC37B787_WDT=3Dm CONFIG_VIA_WDT=3Dm CONFIG_W83627HF_WDT=3Dm CONFIG_W83697HF_WDT=3Dm @@ -3090,7 +3090,7 @@ CONFIG_W83697UG_WDT=3Dm CONFIG_W83877F_WDT=3Dm CONFIG_W83977F_WDT=3Dm CONFIG_MACHZ_WDT=3Dm -# CONFIG_SBC_EPX_C3_WATCHDOG is not set +CONFIG_SBC_EPX_C3_WATCHDOG=3Dm =20 # # ISA-based Watchdog Cards diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.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=3Dy # CONFIG_SOFT_WATCHDOG=3Dm CONFIG_RETU_WATCHDOG=3Dm -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set +CONFIG_ACQUIRE_WDT=3Dm +CONFIG_ADVANTECH_WDT=3Dm CONFIG_ALIM1535_WDT=3Dm CONFIG_ALIM7101_WDT=3Dm CONFIG_F71808E_WDT=3Dm CONFIG_SP5100_TCO=3Dm CONFIG_GEODE_WDT=3Dm -# CONFIG_SC520_WDT is not set +CONFIG_SC520_WDT=3Dm CONFIG_SBC_FITPC2_WATCHDOG=3Dm -# CONFIG_EUROTECH_WDT is not set +CONFIG_EUROTECH_WDT=3Dm CONFIG_IB700_WDT=3Dm CONFIG_IBMASR=3Dm -# CONFIG_WAFER_WDT is not set +CONFIG_WAFER_WDT=3Dm CONFIG_I6300ESB_WDT=3Dm CONFIG_IE6XX_WDT=3Dm CONFIG_ITCO_WDT=3Dm -# CONFIG_ITCO_VENDOR_SUPPORT is not set +CONFIG_ITCO_VENDOR_SUPPORT=3Dy CONFIG_IT8712F_WDT=3Dm CONFIG_IT87_WDT=3Dm CONFIG_HP_WATCHDOG=3Dm CONFIG_HPWDT_NMI_DECODING=3Dy -# CONFIG_SC1200_WDT is not set -# CONFIG_PC87413_WDT is not set +CONFIG_SC1200_WDT=3Dm +CONFIG_PC87413_WDT=3Dm CONFIG_NV_TCO=3Dm -# 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=3Dm +CONFIG_SBC8360_WDT=3Dm +CONFIG_SBC7240_WDT=3Dm +CONFIG_CPU5_WDT=3Dm CONFIG_SMSC_SCH311X_WDT=3Dm -# CONFIG_SMSC37B787_WDT is not set +CONFIG_SMSC37B787_WDT=3Dm CONFIG_VIA_WDT=3Dm CONFIG_W83627HF_WDT=3Dm CONFIG_W83697HF_WDT=3Dm @@ -3108,7 +3108,7 @@ CONFIG_W83697UG_WDT=3Dm CONFIG_W83877F_WDT=3Dm CONFIG_W83977F_WDT=3Dm CONFIG_MACHZ_WDT=3Dm -# CONFIG_SBC_EPX_C3_WATCHDOG is not set +CONFIG_SBC_EPX_C3_WATCHDOG=3Dm CONFIG_XEN_WDT=3Dm =20 # diff --git a/lfs/watchdog b/lfs/watchdog index 8058c8c..70bf692 100644 --- a/lfs/watchdog +++ b/lfs/watchdog @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.9 +VER =3D 5.13 =20 THISAPP =3D watchdog-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D watchdog -PAK_VER =3D 3 +PAK_VER =3D 4 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D d7cae3c9829f5d9a680764f314234867 +$(DL_FILE)_MD5 =3D 153455f008f1cf8f65f6ad9586a21ff1 =20 install : $(TARGET) =20 @@ -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=3D/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 +# +######################################################################## =20 . /etc/sysconfig/rc . ${rc_functions} =20 -PATH=3D/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=3D0 - -# Specify additional watchdog options here (see manpage). -watchdog_options=3D"" - -# Specify module to load -watchdog_module=3D"none" - -[ -e /etc/sysconfig/watchdog ] && . /etc/sysconfig/watchdog - -DAEMON=3D/usr/sbin/watchdog -WD_DAEMON=3D/usr/sbin/wd_keepalive +if [ -e "/etc/sysconfig/watchdog" ]; then + . /etc/sysconfig/watchdog +fi =20 case "${1}" in start) - boot_mesg "Starting watchdog ..." - if [ $run_watchdog =3D 1 ] - then - # do we have to load a module? - [ ${watchdog_module:-none} !=3D "none" ] && /sbin/modprobe $watchdog_modu= le - - 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} ;; =20 stop) - boot_mesg "Stopping watchdog ..." - killproc $DAEMON + boot_mesg "Stopping watchdog daemon..." + killproc /usr/sbin/watchdog ;; =20 restart) @@ -48,7 +35,7 @@ case "${1}" in ;; =20 status) - statusproc $DAEMON + statusproc /usr/sbin/watchdog ;; =20 *) @@ -57,3 +44,4 @@ case "${1}" in ;; esac =20 +# End $rc_base/init.d/watchdog hooks/post-receive -- IPFire 2.x development tree --===============1021311463861458551==--