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

Fix breakage where recent changes broke nodeset shell and friends

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16076 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-04-26 14:10:58 +00:00
parent 248569fa64
commit 90f638f3b2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@ -86,7 +86,9 @@ sub setstate {
my %machash = %{shift()};
my %nthash = %{shift()};
my $tftpdir = shift;
my %linuximghash = %{shift()};
my %linuximghash = ();
my $linuximghashref = shift;
if (ref $linuximghashref) { %linuximghash = %{$linuximghashref}; }
my $imgaddkcmdline=($linuximghash{'boottarget'})? undef:$linuximghash{'addkcmdline'};
my $kern = $bphash{$node}->[0]; #$bptab->getNodeAttribs($node,['kernel','initrd','kcmdline']);

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

@ -97,7 +97,9 @@ sub setstate {
my %machash = %{shift()};
my %iscsihash = %{shift()};
my $tftpdir = shift;
my %linuximghash = %{shift()};
my %linuximghash = ();
my $linuximghashref = shift;
if (ref $linuximghashref) { %linuximghash = %{$linuximghashref}; }
my $imgaddkcmdline=($linuximghash{'boottarget'})? undef:$linuximghash{'addkcmdline'};
my $kern = $bphash{$node}->[0]; #$bptab->getNodeAttribs($node,['kernel','initrd','kcmdline']);
unless ($addkcmdlinehandled->{$node}) { #Tag to let us know the plugin had a special syntax implemented for addkcmdline