From 71d4dabbd41fe818e649b217c4e6aa7e735a82d7 Mon Sep 17 00:00:00 2001 From: jjohnson2 Date: Fri, 20 Mar 2015 11:00:10 -0400 Subject: [PATCH] Give confetty based consoles more of a grace period For people doing X forwarding, wcons tiling has always been flaky. For confluent, we have a better cue, so give it more time for the sake of X forwarded users --- xCAT-client/bin/wcons | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xCAT-client/bin/wcons b/xCAT-client/bin/wcons index 994987ca6..79e959817 100755 --- a/xCAT-client/bin/wcons +++ b/xCAT-client/bin/wcons @@ -109,6 +109,9 @@ if (defined($tilefact)) { system("xterm $xrm -bg black -fg white -title $firstnode -n $firstnode -geometry $sizegeometry+0+0 ".join(" ",@ARGV)." -e /bin/bash -c \"/bin/true ".$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; + if (-x "/opt/confluent/bin/confetty" or -x "/usr/bin/confetty" or -x "/usr/local/bin/confetty" ) { + $remainwait = 10; + } while (not -S "/tmp/wconscontrol.$firstnode.$$" and $remainwait > 0) { sleep(0.1); $remainwait -= 0.1;