arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix xnba to be strict compliant, fix regex typo, fix regex globals on syslinux/elilo

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11355 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-01-05 20:20:24 +00:00
parent f12120de1c
commit 083be780f4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/xcat/plugins/xnba.pm
View File

@ -1,5 +1,6 @@
# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
package xCAT_plugin::xnba;
use strict;
use Sys::Syslog;
use Socket;
use File::Copy;
@ -134,11 +135,11 @@ sub setstate {
if ($kern->{kcmdline} =~ /!myipfn!/) {
my $ipfn = '${next-server}';#xCAT::Utils->my_ip_facing($node);
$kern->{kcmdline} =~ s/!myipfn!/$ipfn/g;
$elilokmdline =~ s/!myipfn!/%N/;
$elilokcmdline =~ s/!myipfn!/%N/g;
$ipfn = xCAT::Utils->my_ip_facing($node);
unless ($ipfn) { $ipfn = $::XCATSITEVALS{master}; }
if ($ipfn) {
$pxelinuxkcmdline =~ s/!myipfn!/$ipfn/;
$pxelinuxkcmdline =~ s/!myipfn!/$ipfn/g;
}
}
my $pcfg;
@ -280,6 +281,8 @@ sub preprocess_request {
#use Getopt::Long;
Getopt::Long::Configure("bundling");
Getopt::Long::Configure("pass_through");
my $HELP;
my $VERSION;
if (!GetOptions('h|?|help' => \$HELP, 'v|version' => \$VERSION) ) {
if($usage{$command}) {
my %rsp;
@ -493,6 +496,8 @@ sub process_request {
$response{node}->[0]->{data}->[0]= getstate($_);
$callback->(\%response);
} elsif ($args[0]) { #If anything else, send it on to the destiny plugin, then setstate
my $rc;
my $errstr;
($rc,$errstr) = setstate($_,\%bphash,\%chainhash,\%machash,\%iscsihash);
#currently, it seems setstate doesn't return error codes...
#if ($rc) {
@ -580,7 +585,7 @@ sub getNodesetStates {
foreach my $node (@nodes) {
my $tmp=getstate($node);
my @a=split(' ', $tmp);
$stat = $a[0];
my $stat = $a[0];
if (exists($hashref->{$stat})) {
my $pa=$hashref->{$stat};
push(@$pa, $node);