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

fixing bug 3653 on sles and ubuntu.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16985 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-07-17 03:07:26 +00:00
parent 4e11f026ef
commit f4e93057b1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ unless ($onlyinitrd) {
}
my $index=1;
my $pass;
foreach $pass (sort (keys(%extra_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
my $whole_path="$srcdir_otherpkgs/$_";
@ -393,7 +393,7 @@ unless ($onlyinitrd) {
my %pkg_hash=imgutils::get_package_names($pkglist);
my $index=1;
foreach $pass (sort (keys(%pkg_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%pkg_hash))) {
$pkgnames = "";
$group_pkgnames = "";
foreach (keys(%{$pkg_hash{$pass}})) {
@ -472,7 +472,7 @@ unless ($onlyinitrd) {
}
}
foreach $pass (sort (keys(%extra_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
my $index=1;
#remove the old repository for extra packages

6
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@ -263,7 +263,7 @@ unless ($onlyinitrd) {
my %pkg_hash=imgutils::get_package_names($pkglist);
my $index=1;
my $pass;
foreach $pass (sort (keys(%pkg_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%pkg_hash))) {
my $pkgnames = "";
foreach (keys(%{$pkg_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
@ -355,7 +355,7 @@ unless ($onlyinitrd) {
if (keys(%extra_hash) > 0) {
my $index=1;
foreach $pass (sort (keys(%extra_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
$index++;
@ -365,7 +365,7 @@ unless ($onlyinitrd) {
}
$index--;
foreach $pass (sort (keys(%extra_hash))) {
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
my $envlist;
if(exists($extra_hash{$pass}{ENVLIST})){
$envlist = join(' ', @{$extra_hash{$pass}{ENVLIST}});