Author: arekm                        Date: Mon Jan 14 14:35:04 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   watchdog.init (1.12 -> 1.13) , watchdog.sysconfig (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/watchdog.init
diff -u SOURCES/watchdog.init:1.12 SOURCES/watchdog.init:1.13
--- SOURCES/watchdog.init:1.12  Thu Dec  8 02:02:49 2005
+++ SOURCES/watchdog.init       Mon Jan 14 15:34:59 2008
@@ -62,13 +62,15 @@
                # minute to reboot cleanly, or it will be rebooted by the 
kernel. If
                # this behavior  isn't what you  want, just uncomment  the 
following
                # lines
-               if [ -z "$WATCHDOG_MODULES" ]; then
-                       # try to unload software module
-                       rmmod -s softdog > /dev/null 2>&1
-               else
-                       for module in $WATCHDOG_MODULES; do
-                               rmmod -s $module > /dev/null 2>&1
-                       done
+               if [ "$WATCHDOG_UNLOAD" = "yes" ]; then
+                       if [ -z "$WATCHDOG_MODULES" ]; then
+                               # try to unload software module
+                               rmmod -s softdog > /dev/null 2>&1
+                       else
+                               for module in $WATCHDOG_MODULES; do
+                                       rmmod -s $module > /dev/null 2>&1
+                               done
+                       fi
                fi
 
                rm -f /var/lock/subsys/watchdog >/dev/null 2>&1

================================================================
Index: SOURCES/watchdog.sysconfig
diff -u SOURCES/watchdog.sysconfig:1.3 SOURCES/watchdog.sysconfig:1.4
--- SOURCES/watchdog.sysconfig:1.3      Sun Jul 30 21:55:49 2006
+++ SOURCES/watchdog.sysconfig  Mon Jan 14 15:34:59 2008
@@ -10,3 +10,6 @@
 # WATCHDOG_MODULES - list of watchdog modules to be preloaded (space separated)
 # softdog module will be used is none set
 WATCHDOG_MODULES=
+
+# Unload watchdog kernel modules, not recommended
+# WATCHDOG_UNLOAD=yes
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/watchdog.init?r1=1.12&r2=1.13&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/watchdog.sysconfig?r1=1.3&r2=1.4&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to