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

Merge pull request #5979 from immarvin/onsles

Browse Source 
fix issue nodeset calculate wrong path for deploying sles when using "copycds -p"
This commit is contained in:
Yuan Bai 2019-01-24 18:00:22 +08:00 committed by GitHub
commit e75fc7fbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -937,14 +937,12 @@ sub mkinstall
# trim the "/" in /install/sles11.3/x86_64/
$pkgdir =~ s/\/$//;
if ($pkgdir =~ /^($installroot\/$os\/$arch)$/) {
if ( -d "$pkgdir/2") {
$srcdirs[0] = "$pkgdir/1,$pkgdir/2";
}else{
$srcdirs[0] = "$pkgdir/1";
}
$tmppkgdir = join(",", @srcdirs);
if ( -d "$pkgdir/2") {
$srcdirs[0] = "$pkgdir/1,$pkgdir/2";
}else{
$srcdirs[0] = "$pkgdir/1";
}
$tmppkgdir = join(",", @srcdirs);
#Call the Template class to do substitution to produce a kickstart file in the autoinst dir
my $tmperr;