xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 02:42:41 +00:00
Code Issues Releases Wiki Activity

fix defect #4293 [[FVT]:genimage failed not finding otherpkg repo file

Browse Source
This commit is contained in:
immarvin
2014-10-15 08:42:35 -07:00
parent 053225fb26
commit 2a494808f7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,9 +338,10 @@ unless ($onlyinitrd) {
#add the other package directory to for apt-get install
open ($aptconfig,">","$rootimg_dir/etc/apt/sources.list.d/genimage.apt.list");
if ($otherpkgsdir_local){
print $aptconfig "deb file://$otherpkgsdir_local ./\n";
}
#if ($otherpkgsdir_local){
# # print $aptconfig "deb file://$otherpkgsdir_local ./\n";
# print $aptconfig "deb file:///mnt/otherpkgdir/ ./\n";
#}
if ($otherpkgsdir_internet){
print $aptconfig $otherpkgsdir_internet;
}
@@ -367,6 +368,7 @@ unless ($onlyinitrd) {
my %extrapkgnames;
if (keys(%extra_hash) > 0) {
open ($aptconfig,">","$rootimg_dir/etc/apt/sources.list.d/genimage.apt.list");
my $index=1;
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
@@ -376,11 +378,13 @@ unless ($onlyinitrd) {
}
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);
}
}
close($aptconfig);
$index--;
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
@@ -403,7 +407,9 @@ unless ($onlyinitrd) {
# install extra packages
my $aptgetcmd_base = $aptgetcmd;
$aptgetcmd .= " install ";
# to prevent "The following packages cannot be authenticated" error,
# invoke apt-get with "--allow-unauthenticated" option
$aptgetcmd .= " install --allow-unauthenticated ";
# append extra pkg names to yum command
if ($extrapkgnames{$pass}) {
$aptgetcmd .= " $extrapkgnames{$pass} ";