Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 24e278e14a25367b8cb2fce8af484abd > files > 172

cman-2.0.115-96.el5_8.3.src.rpm

commit bdb05eefde2a1a898f39cfd2165dcb059b8b0c58
Author: Ryan O'Hara <rohara@redhat.com>
Date:   Thu Nov 12 16:23:27 2009 -0600

    CMAN: scsi_reserve should always echo after failure
    
    There were a few places in the scsi_reserve init script where we
    did not echo after calling 'failure'. Without the echo the output
    is mangled.
    
    rhbz#514260

diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 2f10abc..f0f5a63 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -89,6 +89,7 @@ if [ -z "$pv_devices" ] ; then
     logger -t scsi_reserve \
 	"[error] did not find devices in cluster volumes"
     failure
+    echo
     exit 1
 fi
 
@@ -113,6 +114,7 @@ do
 	    logger -t scsi_reserve \
 		"[error] $dev is not a multipath device"
 	    failure
+	    echo
 	    exit 1
 	fi
     else
@@ -134,6 +136,7 @@ if [ -z "$cluster_id" ] ; then
     logger -s -t scsi_reserve \
 	"[error] unable to determine cluster id"
     failure
+    echo
     exit 1
 fi
 
@@ -146,6 +149,7 @@ if [ -z "$node_id" ] ; then
     logger -t scsi_reserve \
 	"[error] unable to determine node id"
     failure
+    echo
     exit 1
 fi
 
@@ -157,6 +161,7 @@ if [ -z "$key" ] ; then
     logger -t scsi_reserve \
 	"[error] unable to generate key"
     failure
+    echo
     exit 1
 fi