diff --git a/xCAT-server-2.0/lib/xcat/plugins/bind.pm b/xCAT-server-2.0/lib/xcat/plugins/bind.pm index 5cc6f4912..2a77815b3 100755 --- a/xCAT-server-2.0/lib/xcat/plugins/bind.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/bind.pm @@ -87,6 +87,10 @@ sub process_request { } unless (grep /^-n$/,@args) { my $nettab = xCAT::Table->new('networks'); + unless ($nettab) { + $callback->({error=>"Unable to open networks table, has makenetworks been run?"}); + return; + } foreach (@{$nettab->getAllEntries()}) { push @args,"-n"; push @args,$_->{net}.":".$_->{mask} diff --git a/xCAT-server-2.0/lib/xcat/plugins/centos.pm b/xCAT-server-2.0/lib/xcat/plugins/centos.pm index b2c3ebbc2..b4c30d2aa 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/centos.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/centos.pm @@ -212,7 +212,7 @@ sub mkinstall { my $ent = $restab->getNodeAttribs($node,['nfsserver','serialport','primarynic','installnic']); my $sent = $hmtab->getNodeAttribs($node,['serialspeed','serialflow']); unless ($ent and $ent->{nfsserver}) { - $callback->({error=>["No noderes.nfsserver defined for ".$ent->{profile}],errorcode=>[1]}); + $callback->({error=>["No noderes.nfsserver defined for ".$node],errorcode=>[1]}); next; } my $kcmdline="nofb utf8 ks=http://".$ent->{nfsserver}."/install/autoinst/".$node; diff --git a/xCAT-server-2.0/lib/xcat/plugins/destiny.pm b/xCAT-server-2.0/lib/xcat/plugins/destiny.pm index b550403a5..a276522b0 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/destiny.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/destiny.pm @@ -59,13 +59,14 @@ sub setdestiny { my $ntent = $nodetype->getNodeAttribs($_,[qw(os arch profile)]); if ($ntent and $ntent->{os}) { $nstates{$_} .= " ".$ntent->{os}; - } + } else { $errored =1; $callback->({error=>"nodetype.os not defined for $_"}); } if ($ntent and $ntent->{arch}) { $nstates{$_} .= "-".$ntent->{arch}; - } + } else { $errored =1; $callback->({error=>"nodetype.arch not defined for $_"}); } if ($ntent and $ntent->{profile}) { $nstates{$_} .= "-".$ntent->{profile}; - } + } else { $errored =1; $callback->({error=>"nodetype.profile not defined for $_"}); } + if ($errored) {return;} unless ($state =~ /^netboot/) { $chaintab->setNodeAttribs($_,{currchain=>"boot"}); }; } } elsif ($state eq "shell" or $state eq "standby" or $state =~ /^runcmd/) { diff --git a/xCAT-server-2.0/lib/xcat/plugins/fedora.pm b/xCAT-server-2.0/lib/xcat/plugins/fedora.pm index 0f8df455b..7b801ff34 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/fedora.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/fedora.pm @@ -224,7 +224,7 @@ sub mkinstall { my $hmtab = xCAT::Table->new('nodehm'); my $sent = $hmtab->getNodeAttribs($node,['serialspeed','serialflow']); unless ($ent and $ent->{nfsserver}) { - $callback->({error=>["No noderes.nfsserver defined for ".$ent->{profile}],errorcode=>[1]}); + $callback->({error=>["No noderes.nfsserver defined for ".$node],errorcode=>[1]}); next; } my $kcmdline="nofb utf8 ks=http://".$ent->{nfsserver}."/install/autoinst/".$node; diff --git a/xCAT-server-2.0/lib/xcat/plugins/rhel.pm b/xCAT-server-2.0/lib/xcat/plugins/rhel.pm index cf8a77ca1..3bc33b67b 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/rhel.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/rhel.pm @@ -227,7 +227,7 @@ sub mkinstall { my $hmtab = xCAT::Table->new('nodehm'); my $sent = $hmtab->getNodeAttribs($node,['serialspeed','serialflow']); unless ($ent and $ent->{nfsserver}) { - $callback->({error=>["No noderes.nfsserver defined for ".$ent->{profile}],errorcode=>[1]}); + $callback->({error=>["No noderes.nfsserver defined for ".$node],errorcode=>[1]}); next; } my $kcmdline="nofb utf8 ks=http://".$ent->{nfsserver}."/install/autoinst/".$node; diff --git a/xCAT-server-2.0/lib/xcat/plugins/sles.pm b/xCAT-server-2.0/lib/xcat/plugins/sles.pm index 777a602ef..a9c9c81ac 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/sles.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/sles.pm @@ -93,7 +93,7 @@ sub mkinstall { my $ent = $restab->getNodeAttribs($node,['nfsserver','serialport','primarynic','installnic']); my $sent = $hmtab->getNodeAttribs($node,['serialspeed','serialflow']); unless ($ent and $ent->{nfsserver}) { - $callback->({error=>["No server for $node defined"],errorcode=>[1]}); + $callback->({error=>["No noderes.nfsserver for $node defined"],errorcode=>[1]}); next; } my $kcmdline="autoyast=http://".$ent->{nfsserver}."/install/autoinst/".$node." install=http://".$ent->{nfsserver}."/install/$os/$arch/1";