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

Fix problem where only one profile was processed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13750 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-09-10 20:26:55 +00:00
parent 102aa513e4
commit 7cf628060e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -1138,7 +1138,7 @@ sub mkinstall
{
#TODO: driver slipstream, targetted for network.
unless ($doneimgs{"$os|$arch"})
unless ($doneimgs{"$os|$arch|$profile|$tftpdir"})
{
mkpath("$tftpdir/xcat/$os/$arch");
if($esxi){
@ -1155,7 +1155,7 @@ sub mkinstall
copy($initrdpath,"$tftppath/initrd.img");
&insert_dd($callback, $os, $arch, "$tftppath/initrd.img", $driverupdatesrc, $netdrivers);
}
$doneimgs{"$os|$arch"} = 1;
$doneimgs{"$os|$arch|$profile|$tftpdir"} = 1;
}
#We have a shot...

4
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -837,7 +837,7 @@ sub mkinstall
#TODO: driver slipstream, targetted for network.
unless ($doneimgs{"$os|$arch|$tftpdir"})
unless ($doneimgs{"$os|$arch|$profile|$tftpdir"})
{
my $tftppath;
if ($profile) {
@ -861,7 +861,7 @@ sub mkinstall
copy("$pkgdir/1/suseboot/inst64", "$tftppath");
@dd_drivers = &insert_dd($callback, $os, $arch, "$tftppath/inst64", $driverupdatesrc, $netdrivers);
}
$doneimgs{"$os|$arch|$tftpdir"} = 1;
$doneimgs{"$os|$arch|$profile|$tftpdir"} = 1;
}
#We have a shot...