xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 05:12:30 +00:00
Code Issues Releases Wiki Activity

fix defect #3626 yaboot.pm needs to use pkgdir

Browse Source
This commit is contained in:
immarvin
2013-10-22 04:54:50 -07:00
parent 4d4b18ce31
commit 8519f75881
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,7 +625,7 @@ sub process_request {
return;
}
}
} #end of foreach oshash
} #end of foreach osimagenodehash
#Don't bother to try dhcp binding changes if sub_req not passed, i.e. service node build time
unless (($args[0] eq 'stat') || ($inittime) || ($args[0] eq 'offline')) {
@@ -642,8 +642,11 @@ sub process_request {
#}
if ($do_dhcpsetup) {
if (%oshash) {
foreach my $osentry (keys %oshash) {
if (%osimagenodehash) {
foreach my $osimage (keys %osimagenodehash) {
my $osimgent = $osimagetab->getAttribs({imagename => $osimage },'osvers');
my $osentry = $osimgent->{'osvers'};
my $osv;
my $osn;
my $osm;
@@ -662,20 +665,20 @@ sub process_request {
my $fpath = "/yb/". $osentry."/yaboot";
if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
$sub_req->({command=>['makedhcp'],
node=>\@{$oshash{$osentry}},
node=>\@{$osimagenodehash{$osimage}},
arg=>['-l','-s','filename = \"'.$fpath.'\";']},$callback);
} else {
$sub_req->({command=>['makedhcp'],
node=>\@{$oshash{$osentry}},
node=>\@{$osimagenodehash{$osimage}},
arg=>['-s','filename = \"'.$fpath.'\";']},$callback);
}
} else {
if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command, only change local settings if already farmed
$sub_req->({command=>['makedhcp'],arg=>['-l'],
node=>\@{$oshash{$osentry}}},$callback);
node=>\@{$osimagenodehash{$osimage}}},$callback);
} else {
$sub_req->({command=>['makedhcp'],
node=>\@{$oshash{$osentry}}},$callback);
node=>\@{$osimagenodehash{$osimage}}},$callback);
}
}
}