From cb840cc20623a63a635d6fa6b9a2bff89f84411c Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Thu, 26 Mar 2020 17:57:52 +0200 Subject: [PATCH] Fixes raw templates not downloading --- .../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 e0d84a652670..5e0811da44b7 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 @@ -58,7 +58,7 @@ public static String checkTemplateFormat(String path, String uripath) { return ""; } // raw - if ((output.contains("x86 boot") || output.contains("data")) && (isCorrectExtension(uripath, "raw"))) { + 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 ""; }