xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 18:50:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2160 from immarvin/onobjname

Browse Source 
fix issue "xCAT Object Name Format" error when trying to name osimages starting with "rhels7.3" #2157
This commit is contained in:
Pat Lundgren
2016-11-16 11:42:41 -05:00
committed by GitHub
parent ba63e78399 b0791921bb
commit bc0dcddcb0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1546,7 +1546,12 @@ sub defmk
my $invalidobjname = ();
my $invalidnodename = ();
foreach my $node (@::allobjnames) {
unless(isobjnamevalid($node,$::opt_t)){
my $myobjtype=$::opt_t;
if(!$myobjtype and $::FILEATTRS{$node}{'objtype'}){
$myobjtype=$::FILEATTRS{$node}{'objtype'};
}
unless(isobjnamevalid($node,$myobjtype)){
$invalidobjname .= ",$node";
}
if (($node =~ /[A-Z]/) && (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node"))) {