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

fixes to genimage for NEW_INSTALL_LIST processing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5617 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2010-03-31 00:51:21 +00:00
parent cbf383dd9e
commit 1b819b4b1f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -286,7 +286,7 @@ unless ($onlyinitrd) {
}
my $index=1;
my $pass;
foreach $pass (keys(%extra_hash)) {
foreach $pass (sort (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next;}
my $whole_path="$srcdir_otherpkgs/$_";
@ -359,22 +359,23 @@ unless ($onlyinitrd) {
my %pkg_hash=get_package_names($pkglist);
my $index=1;
foreach $pass (keys(%pkg_hash)) {
foreach $pass (sort (keys(%pkg_hash))) {
$pkgnames = "";
foreach (keys(%{$pkg_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next;}
my $pa=$pkg_hash{$pass}{$_};
$pkgnames .= " " . join(' ', @$pa);
}
#print "$yumcmd $pkgnames\n";
print "$yumcmd $pkgnames\n";
my $rc = system("$yumcmd $pkgnames");
if ($rc) {
print "zypper invocation failed\n";
$rc = $rc >> 8;
if (($rc) && ($rc != '104')) {
print "zypper invocation failed with rc: $rc\n";
exit 1;
}
}
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= "zypper -R $rootimg_dir remove ";
if (exists ($extra_hash{$pass}{'PRE_REMOVE'})) {
@ -388,10 +389,11 @@ unless ($onlyinitrd) {
#add extra packages in the list
if ($extrapkgnames{$pass}) {
#print "$yumcmd $extrapkgnames{$pass}\n";
print "$yumcmd $extrapkgnames{$pass}\n";
$rc = system("$yumcmd $extrapkgnames{$pass}");
if ($rc) {
print "zypper invocation failed\n";
$rc = $rc >> 8;
if (($rc) && ($rc != '104')) {
print "zypper invocation failed with rc: $rc\n";
exit 1;
}
}