xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 13:22:36 +00:00
Code Issues Releases Wiki Activity

fix bug: #4512 nodeset will throw error if osimage pkgdir contains multi-value in ubuntu

Browse Source
This commit is contained in:
Leo.C.Wu
2015-01-09 11:19:52 +08:00
parent 4bb3e79ad2
commit e1cb0c719d
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/debian.pm
View File

@@ -711,6 +711,12 @@ sub mkinstall
my $initrdpath;
my $maxmem;
# only first value is adopted, please see tabdump linuximage, section pkgdir.
my @pkgdirs = split(/,/, $pkgdir);
if (scalar(@pkgdirs) > 1) {
$pkgdir = @pkgdirs[0];
}
if (
(
($arch =~ /x86/ and

7
xCAT-server/lib/xcat/plugins/genimage.pm
View File

@@ -170,6 +170,13 @@ sub process_request {
$pkglist = $ref_linuximage_tab->{'pkglist'};
$srcdir = $ref_linuximage_tab->{'pkgdir'};
my @pkgarray = split(/,/, $ref_linuximage_tab->{'pkgdir'});
if(scalar(@pkgarray) > 1)
{
$srcdir = @pkgarray[0];
}
$srcdir_otherpkgs = $ref_linuximage_tab->{'otherpkgdir'};
$otherpkglist = $ref_linuximage_tab->{'otherpkglist'};
$postinstall_filename = $ref_linuximage_tab->{'postinstall'};