fixes to genimage for NEW_INSTALL_LIST processing

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5618 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2010-03-31 00:53:54 +00:00
parent 1b819b4b1f
commit 156f6c1be2

View File

@ -243,7 +243,7 @@ unless ($onlyinitrd) {
my %pkg_hash=get_package_names($pkglist);
my $index=1;
my $pass;
foreach $pass (keys(%pkg_hash)) {
foreach $pass (sort (keys(%pkg_hash))) {
my $pkgnames = "";
foreach (keys(%{$pkg_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next;}
@ -273,7 +273,7 @@ unless ($onlyinitrd) {
if (keys(%extra_hash) > 0) {
open($yumconfig,">>","/tmp/genimage.$$.yum.conf");
my $index=1;
foreach $pass (keys(%extra_hash)) {
foreach $pass (sort (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next;}
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
@ -292,7 +292,7 @@ unless ($onlyinitrd) {
$yumcmd .= "--enablerepo=otherpkgs$_ ";
}
foreach $pass (keys(%extra_hash)) {
foreach $pass (sort (keys(%extra_hash))) {
#remove the packages that are specified in the otherpkgs.list files with leading '-'
my $yumcmd_remove= "$yumcmd erase ";
if (exists ($extra_hash{$pass}{'PRE_REMOVE'})) {