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

-Have pxe and yaboot only do hierarchical DHCP manipulation when not already farmed out

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3022 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-03-27 22:09:54 +00:00
parent f4e80e3725
commit 2c970102c5
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ sub process_request {
}
#if not shared, then help sync up
if ($req->{_disparatetftp}) { #reading hint from preprocess_command
if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
@nodes = ();
foreach (@rnodes) {
if (xCAT::Utils->nodeonmynet($_)) {
@ -339,9 +339,14 @@ sub process_request {
}
}
if ($args[0] ne 'stat') {
if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
$sub_req->({command=>['makedhcp'],arg=>['-l'],
node=>\@nodes},$callback);
} else {
$sub_req->({command=>['makedhcp'],
node=>\@nodes},$callback);
}
}
}

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

@ -256,7 +256,7 @@ sub process_request {
#back to normal business
#if not shared tftpdir, then filter, otherwise, set up everything
if ($req->{_disparatetftp}) { #reading hint from preprocess_command
if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
@nodes = ();
foreach (@rnodes) {
if (xCAT::Utils->nodeonmynet($_)) {
@ -320,12 +320,23 @@ sub process_request {
}
}
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'],
node=>\@normalnodeset},$callback);
} else {
$sub_req->({command=>['makedhcp'],
node=>\@normalnodeset},$callback);
}
my @breaknetboot=keys %breaknetbootnodes;
$sub_req->({command=>['makedhcp'],
if ($req->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
$sub_req->({command=>['makedhcp'],
node=>\@breaknetboot,
arg=>['-l','-s','filename = \"xcat/nonexistant_file_to_intentionally_break_netboot_for_localboot_to_work\";']},$callback);
} else {
$sub_req->({command=>['makedhcp'],
node=>\@breaknetboot,
arg=>['-s','filename = \"xcat/nonexistant_file_to_intentionally_break_netboot_for_localboot_to_work\";']},$callback);
}
}