diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm index c521e906c..31b4ac625 100644 --- a/xCAT-server/lib/xcat/plugins/AAsn.pm +++ b/xCAT-server/lib/xcat/plugins/AAsn.pm @@ -53,6 +53,7 @@ sub handled_commands { + # If called in XCATBYPASS mode, don't do any setup if ($ENV{'XCATBYPASS'}) { @@ -66,6 +67,7 @@ sub handled_commands } my $rc = 0; + my $plugins_dir=$::XCATROOT.'/lib/perl/xCAT_plugin'; if (xCAT::Utils->isServiceNode()) { @@ -936,6 +938,7 @@ sub setup_TFTP } else { #if not mounting, have to regenerate.... #first, run mknb to get nbfs and such going? my $cmdref; + use xCAT_plugin::mknb; $cmdref->{command}->[0] = "mknb"; $cmdref->{arg}->[0] = "ppc64"; ${"xCAT_plugin::mknb::"}{process_request}->($cmdref, \&xCAT::Client::handle_response); @@ -944,7 +947,6 @@ sub setup_TFTP $cmdref->{arg}->[0] = "x86_64"; ${"xCAT_plugin::mknb::"}{process_request}->($cmdref, \&xCAT::Client::handle_response); #now, run nodeset enact on - #now, run nodeset enact on my $mactab = xCAT::Table->new('mac'); my $hmtab = xCAT::Table->new('nodehm'); if ($mactab and $hmtab) { @@ -966,6 +968,7 @@ sub setup_TFTP $cmdref->{cwd}->[0] = "/opt/xcat/sbin"; foreach my $modname (keys %netmethods) { $cmdref->{node} = $netmethods{$modname}; + require "$plugins_dir/$modname.pm"; ${"xCAT_plugin::" . $modname . "::"}{process_request}->($cmdref, \&xCAT::Client::handle_response); } diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm index 67639c12a..631646641 100644 --- a/xCAT-server/lib/xcat/plugins/pxe.pm +++ b/xCAT-server/lib/xcat/plugins/pxe.pm @@ -338,6 +338,7 @@ sub process_request { } } } + unless ($sub_req) { return; } #Don't bother to try dhcp binding changes if sub_req not passed, i.e. service node build time if ($args[0] ne 'stat') { if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command $sub_req->({command=>['makedhcp'],arg=>['-l'], diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm index 948075de4..0fcd343e0 100644 --- a/xCAT-server/lib/xcat/plugins/yaboot.pm +++ b/xCAT-server/lib/xcat/plugins/yaboot.pm @@ -319,6 +319,7 @@ sub process_request { } } } + unless ($sub_req) { return; } #Don't bother to try dhcp binding changes if sub_req not passed, i.e. service node build time my @normalnodeset = keys %normalnodes; if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command, only change local settings if already farmed $sub_req->({command=>['makedhcp'],arg=>['-l'],