From 0d67ef61e7c5fe0681fdb43cf6fd003d5020b39e Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 26 Apr 2013 14:07:02 +0000
Subject: [PATCH] Fix breakage where recent changes broke nodeset shell and
 friends

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16074 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/pxe.pm  | 4 +++-
 xCAT-server/lib/xcat/plugins/xnba.pm | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index e44c667de..7d7239545 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -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']);
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index f06208883..42fb1c2cf 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -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