Have wcons conduct a singular at scale query to pass to rcons

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@428 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-02-08 21:12:56 +00:00
parent 7ddde769d5
commit e6b8dfd8c1
2 changed files with 27 additions and 4 deletions

View File

@ -1,5 +1,8 @@
#!/bin/sh
CONSERVER=`nodels $1 nodehm.conserver`
CONSERVER=$2
if [ -z "$CONSERVER" ]; then
CONSERVER=`nodels $1 nodehm.conserver`
fi
if [ -z "$CONSERVER" ]; then
CONSERVER=$XCATHOST
fi

View File

@ -18,7 +18,27 @@ GetOptions(
'font|f=s' => \$font
);
my $nodes=`nodels $ARGV[0]`;
my $conservers=`nodels $ARGV[0] nodehm.conserver`;
my @conservers=split /\n/,$conservers;
my %conservers;
foreach (@conservers) {
(my $nd,my $col,my $val) = split /:/,$_,3;
$conservers{$nd}=$val;
}
my @nodes = split /\n/,$nodes;
foreach (@nodes) {
if ($conservers{$_}) {
next;
}
if ($ENV{XCATHOST}) {
$conservers{$_} = $ENV{XCATHOST};
$conservers{$_} =~ s/:.*//;
next;
}
$conservers{$_} = 'localhost';
}
my $firstnode = shift @nodes;
my $currx;
my $curry;
@ -50,7 +70,7 @@ if (defined($tilefact)) {
}
system("xterm -fn 5x7 -name $firstnode -title $firstnode -n $firstnode -geometry +0+0 -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & $mydir/rcons $firstnode\" &");
system("xterm -fn 5x7 -name $firstnode -title $firstnode -n $firstnode -geometry +0+0 -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & $mydir/rcons $firstnode ".$conservers{$firstnode}."\" &");
sleep(2); #Give time for window manager to figure out everything
my $xinfo = `xwininfo -name $firstnode`;
my @xinfl = split(/\n/,$xinfo);
@ -86,7 +106,7 @@ if (defined($tilefact)) {
$currx=0;
}
} else {
system("xterm -fn 5x7 -name $firstnode -title $firstnode -n $firstnode -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & $mydir/rcons $firstnode\" &");
system("xterm -fn 5x7 -name $firstnode -title $firstnode -n $firstnode -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & $mydir/rcons $firstnode ".$conservers{$firstnode}."\" &");
}
my $geometry="";
@ -105,7 +125,7 @@ foreach (@nodes) {
}
}
system("xterm -fn 5x7 -name $_ -title $_ -n $_ $geometry -e /bin/sh -c \"$mydir/xtcd.pl .".$ENV{DISPLAY}." $_ $_ & $mydir/rcons $_\" &");
system("xterm -fn 5x7 -name $_ -title $_ -n $_ $geometry -e /bin/sh -c \"$mydir/xtcd.pl .".$ENV{DISPLAY}." $_ $_ & $mydir/rcons $_ ".$conservers{$_}."\" &");
}