[SSI] openssi/openssi-tools/distro/debian/sysv-rc/etc/init.d rc.nodedown,1.3,1.4 rc.sysrecover,1.5,1.6

Update of 
/cvsroot/ssic-linux/openssi/openssi-tools/distro/debian/sysv-rc/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5047

Modified Files:
      Tag: OPENSSI-DEBIAN
        rc.nodedown rc.sysrecover 
Log Message:
Merge with redhat


Index: rc.sysrecover
===================================================================
RCS file: 
/cvsroot/ssic-linux/openssi/openssi-tools/distro/debian/sysv-rc/etc/init.d/rc.sysrecover,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rc.sysrecover       21 Feb 2004 17:21:25 -0000      1.5
+++ rc.sysrecover       26 Mar 2004 14:19:54 -0000      1.6
@@ -12,23 +12,8 @@
 
 /sbin/fix_mtab / $DEVICE
 
-
-DBLOCK="/etc/init.d/debian.lock"
-
-for i in /cluster/var/lock/subsys/L*
-do
-       subsys=${i#/cluster/var/lock/subsys/L???}
-       script="/etc/init.d/$subsys"
-
-       grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo > /dev/null                 
                       
-       if [ "$?" = "0" ] ; then                                                
                            
-               CLASS=`grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo | awk 
{'print $2'}`                 
-               FAIL=`grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo | awk {'print 
$3'}`                  
-               if [ "$CLASS" = "initnode" -a "$FAIL" = "Y" ]; then             
                            
-                       $DBLOCK $script start                                   
                            
-               fi                                                              
                            
-       fi              
-done
+# Move failover of services to nodedown so that it happens after filesystem 
failover
+touch /cluster/RECOVERY
 
 # Make this node's clock a reference clock
 /sbin/ssi-ntpsetrefclk

Index: rc.nodedown
===================================================================
RCS file: 
/cvsroot/ssic-linux/openssi/openssi-tools/distro/debian/sysv-rc/etc/init.d/rc.nodedown,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rc.nodedown 8 Feb 2004 18:52:21 -0000       1.3
+++ rc.nodedown 26 Mar 2004 14:19:54 -0000      1.4
@@ -29,6 +29,30 @@
 
 mount -a -d $1
 
+DBLOCK="/etc/init.d/debian.lock"
+
+# Determine if this nodedown caused initnode failover
+if [ $1 -eq "`cat /cluster/initnode`" -a -e /cluster/RECOVERY ]; then
+
+       rm -f /cluster/RECOVERY
+       echo `clusternode_num` > /cluster/initnode
+
+
+       for i in /cluster/var/lock/subsys/L*
+       do
+               subsys=${i#/cluster/var/lock/subsys/L???}
+               script="/etc/init.d/$subsys"
+
+               grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo > /dev/null
+               if [ "$?" = "0" ] ; then
+                       CLASS=`grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo | 
awk {'print $2'}`
+                       FAIL=`grep ^${subsys}[[:blank:]] /etc/rc.nodeinfo | awk 
{'print $3'}`
+                       if [ "$CLASS" = "initnode" -a "$FAIL" = "Y" ]; then
+                               $DBLOCK $script start
+                       fi
+               fi
+       done
+fi
 #
 # Mark node down
 #



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click