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

fix defect #4274 default otherpkgdir is /install/post/otherpkgs/ubuntu14.04/ppc64el in ubu

Browse Source
This commit is contained in:
immarvin 2014-10-15 21:24:38 -07:00
parent 2a494808f7
commit 2f6be40923
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,8 +373,9 @@ unless ($onlyinitrd) {
foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
foreach (keys(%{$extra_hash{$pass}})) {
if($_ eq "INCLUDEBAD") {
print "Unable to open the following pkglist files:\n".join("\n",@{$extra_hash{$pass}{INCLUDEBAD}});
exit 1;
#print "Unable to open the following pkglist files:\n".join("\n",@{$extra_hash{$pass}{INCLUDEBAD}});
xdie "Unable to open the following pkglist files:\n".join("\n",@{$extra_hash{$pass}{INCLUDEBAD}});
# exit 1;
}
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
@ -423,8 +424,9 @@ unless ($onlyinitrd) {
print "$envlist $aptgetcmd\n";
my $rc = system("$envlist $aptgetcmd");
if ($rc) {
print "apt-get invocation failed\n";
exit 1;
#print "apt-get invocation failed\n";
#exit 1;
xdie "apt-get invocation failed\n";
}
} else {
print "No Packages marked for install\n";
@ -1749,7 +1751,11 @@ sub mount_chroot {
#system("mount -o bind /sys $rootimage_dir/sys");
system("mount -o bind $pkgdir $rootimage_dir/mnt/pkgdir");
if ($otherpkgdir){
system("mount -o bind $otherpkgdir $rootimage_dir/mnt/otherpkgdir");
if(-d $otherpkgdir){
system("mount -o bind $otherpkgdir $rootimage_dir/mnt/otherpkgdir");
}else{
print "The specified otherpkgdir $otherpkgdir does not exist!\n"
}
}
}