xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-17 20:00:19 +00:00
Code Issues Releases Wiki Activity

fix bug 4635: Ubuntu genimage failure leaves bind mounts

Browse Source
This commit is contained in:
ertaozh
2015-05-12 23:14:44 -04:00
parent fbb5fca652
commit e100a5c19a
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,8 +369,7 @@ unless ($onlyinitrd) {
if ($pkglist) {
$updates{'pkglist'} = $pkglist if ($tempfile);
} else {
print "Unable to find package list for $profile!";
exit 1;
xdie "Unable to find package list for $profile!";
}
my %pkg_hash=imgutils::get_package_names($pkglist);
@ -380,8 +379,7 @@ unless ($onlyinitrd) {
my $pkgnames = "";
foreach (keys(%{$pkg_hash{$pass}})) {
if($_ eq "INCLUDEBAD") {
print "Unable to open the following pkglist files:\n".join("\n",@{$pkg_hash{$pass}{INCLUDEBAD}});
exit 1;
xdie "Unable to open the following pkglist files:\n".join("\n",@{$pkg_hash{$pass}{INCLUDEBAD}});
}
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
@ -406,8 +404,7 @@ unless ($onlyinitrd) {
}
}
if ($found eq 0) {
print "Cannot find the kernel with version $kernelver.\n";
exit 1;
xdie "Cannot find the kernel with version $kernelver.\n";
}
push @npa, $kernelname;
}
@ -434,8 +431,7 @@ unless ($onlyinitrd) {
print "$envlist $aptgetcmdby install $pkgnames\n";
my $rc = system("$envlist $aptgetcmdby install --allow-unauthenticated $pkgnames");
if ($rc) {
print "Failed to install packages $pkgnames\n";
exit 1;
xdie "Failed to install packages $pkgnames\n";
}
}
@ -492,9 +488,7 @@ 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}});
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;}
@ -554,8 +548,6 @@ unless ($onlyinitrd) {
print "$envlist $aptgetcmd\n";
my $rc = system("$envlist $aptgetcmd");
if ($rc) {
#print "apt-get invocation failed\n";
#exit 1;
xdie "apt-get invocation failed\n";
}
} else {