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

-Import required modules for service node setup, don't manipulate DHCP during tftp boot building of a service node

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3025 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-03-28 04:49:49 +00:00
parent 968f372bc1
commit eca58ec37a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/AAsn.pm
View File

@ -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);
}

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

@ -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'],

1
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@ -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'],