xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

fix defect 4723 mixed directory and http otherpkgdir make genimage failed.

Browse Source
This commit is contained in:
amy0701 2015-07-06 02:20:19 -04:00
parent a7c0db9d30
commit c8497e2ff2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,12 +490,21 @@ unless ($onlyinitrd) {
if($_ eq "INCLUDEBAD") {
xdie "Unable to open the following pkglist files:\n".join("\n",@{$extra_hash{$pass}{INCLUDEBAD}});
}
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
if ($otherpkgsdir_local) { print $aptconfig "deb file:///mnt/otherpkgdir/$_ ./\n"};
$index++;
my $pa=$extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
#if there is no Packages file in otherpkgsdir local, it will not be added into source list
if ($otherpkgsdir_local)
{
my $tmppkg=$otherpkgsdir_local."/".$_."/Packages";
my $tmpdir=$otherpkgsdir_local."/".$_;
`ls $tmppkg 2>&1`;
if(!$?)
{
print $aptconfig "deb file:///mnt/otherpkgdir/$_ ./\n"
}
};
$index++;
my $pa=$extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);
}
}
close($aptconfig);