From 5de4e26a5976413b1f7aa2c79ffab4069b7b9836 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 12 Feb 2018 14:30:24 -0500
Subject: [PATCH] Better handling multiple dots in copycds name

---
 xCAT-server/lib/perl/xCAT/SvrUtils.pm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index 01b9a06f3..37dab6083 100755
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -469,13 +469,25 @@ sub get_file_name {
     elsif (($genos) && (-r "$searchpath/$profile.$genos.$extension")) {
         return "$searchpath/$profile.$genos.$extension";
     }
-    elsif (-r "$searchpath/$profile.$osbase.$arch.$extension") {
-        return "$searchpath/$profile.$osbase.$arch.$extension";
+    # If the osimge name was specified with -n, the name might contain multiple "."
+    # Chop them off one at a time until filename match is found
+    else {
+        while ($dotpos > 0) {
+
+            if (-r "$searchpath/$profile.$osbase.$arch.$extension") {
+                return "$searchpath/$profile.$osbase.$arch.$extension";
+            }
+            elsif (-r "$searchpath/$profile.$osbase.$extension") {
+                return "$searchpath/$profile.$osbase.$extension";
+            }
+            # Chop off "." from the end and try again
+            $dotpos = rindex($osbase, ".");
+            $osbase = substr($osbase, 0, $dotpos);
+        }
     }
-    elsif (-r "$searchpath/$profile.$osbase.$extension") {
-        return "$searchpath/$profile.$osbase.$extension";
-    }
-    elsif (-r "$searchpath/$profile.$arch.$extension") {
+
+    # No file matching OS name was found, next try just arch, if still nothing -> default to just profile
+    if (-r "$searchpath/$profile.$arch.$extension") {
         return "$searchpath/$profile.$arch.$extension";
     }
     elsif (-r "$searchpath/$profile.$extension") {