From b0791921bb0b07cef558a55fe10618cca5d9cb15 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 16 Nov 2016 03:22:48 -0500
Subject: [PATCH] fix issue "xCAT Object Name Format" error when trying to name
 osimages starting with "rhels7.3" #2157

---
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index dee9b82b1..90ddb541f 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -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"))) {