From 7cf628060ee23997d72fd5b1f974f5ed233d0a2f Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 10 Sep 2012 20:26:55 +0000 Subject: [PATCH] Fix problem where only one profile was processed git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13750 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 4 ++-- xCAT-server/lib/xcat/plugins/sles.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 4600b0b3e..0f2d8b601 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -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... diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index d14ccba55..7e4c16320 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -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...