[SCM] CTDB repository - branch master updated - ctdb-1.10-367-g84ac667

[Ronnie Sahlberg]

The branch, master has been updated
       via  84ac667af408816e5508719b9fdb7c5e25408640 (commit)
       via  a6e61867c7a58d5a77cd8641d8df0b105cddff77 (commit)
      from  20864822372b6d574c545287002a429b273c4bcc (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 84ac667af408816e5508719b9fdb7c5e25408640
Merge: 20864822372b6d574c545287002a429b273c4bcc a6e61867c7a58d5a77cd8641d8df0b105cddff77
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Aug 11 14:15:22 2011 +1000

    Merge remote branch 'martins/eventscript.10.interface'

commit a6e61867c7a58d5a77cd8641d8df0b105cddff77
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Aug 10 16:06:26 2011 +1000

    Eventscripts - fix 10.interface bash incompatibility.
    
    In dash, this fails gracefully with nothing to stderr:
    
      t=$(cat /does_not_exist) 2>/dev/null
    
    In bash the error from cat is still printed due to different order of
    evaluation.
    
    This works everywhere:
    
      t=$(cat /does_not_exist 2>/dev/null)
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/10.interface |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index b912ab3..baf3171 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -44,7 +44,7 @@ monitor_interfaces()
 	    # When we use VLANs for bond interfaces, there will only
 	    # be an entry in /proc for the underlying real interface
 	    REALIFACE=`echo $IFACE |sed -e 's/\..*$//'`
-	    bi=$(get_proc "net/bonding/$REALIFACE") 2>/dev/null && {
+	    bi=$(get_proc "net/bonding/$REALIFACE" 2>/dev/null) && {
 		echo "$bi" | grep -q 'Currently Active Slave: None' && {
 			echo "ERROR: No active slaves for bond device $REALIFACE"
 			fail=1


-- 
CTDB repository