From a5bc39556c7a877743058cf0366b82a33c50da46 Mon Sep 17 00:00:00 2001 From: jjohnson2 Date: Fri, 30 Jan 2015 14:25:08 -0500 Subject: [PATCH] Fix confetty race condition induced by wcons wcons was leaving a common control socket defined for all invocations of confetty. Fix this by not setting a socket for any but the first. The channel is currently only used for wcons initial tiling, so it should only be bothered with for that anyway. --- xCAT-client/bin/wcons | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-client/bin/wcons b/xCAT-client/bin/wcons index abb1df1d9..4523cf5b9 100755 --- a/xCAT-client/bin/wcons +++ b/xCAT-client/bin/wcons @@ -105,6 +105,7 @@ if (defined($tilefact)) { $ENV{CONSCONTROLPATH} = "/tmp/wconscontrol.$firstnode.$$"; system("xterm $xrm -bg black -fg white -title $firstnode -n $firstnode -geometry +0+0 ".join(" ",@ARGV)." -e /bin/bash -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & let SDATE=`date +%s`+5; $mydir/rcons $firstnode ".$conservers{$firstnode}."; if [ \\\$SDATE -gt \\`date +%s\\` ]; then echo Press enter to close; read SDATE; fi \" &"); + $ENV{CONSCONTROLPATH} = ""; my $remainwait = 2; while (not -S "/tmp/wconscontrol.$firstnode.$$" and $remainwait > 0) { sleep(0.1);