[cloudstack] branch 4.13 updated: Fix raw templates not being downloaded (#3993)

[andrijapanic]

This is an automated email from the ASF dual-hosted git repository.

andrijapanic pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new 809dc33  Fix raw templates not being downloaded (#3993)
809dc33 is described below

commit 809dc3353231d772db714852280eadd01944b78f
Author: Spaceman1984 <49917670+spaceman1...@users.noreply.github.com>
AuthorDate: Fri Mar 27 20:48:24 2020 +0200

    Fix raw templates not being downloaded (#3993)
---
 .../java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
 
b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
index f87669b..890e075 100644
--- 
a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
+++ 
b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
@@ -57,7 +57,7 @@ public class ImageStoreUtil {
             return "";
         }
         // raw
-        if ((output.contains("x86 boot") || output.contains("data")) && 
(isCorrectExtension(uripath, "raw") || isCorrectExtension(uripath, "img"))) {
+        if ((output.contains("x86 boot") || output.contains("DOS/MBR boot 
sector") || output.contains("data")) && (isCorrectExtension(uripath, "raw") || 
isCorrectExtension(uripath, "img"))) {
             s_logger.debug("File at path " + path + " looks like a raw image 
:" + output);
             return "";
         }