Fix raw templates not being downloaded (#3993)

Spaceman1984 · web-flow · commit 809dc3353231 · 2020-03-27T19:48:24.000+01:00
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
@@ -57,7 +57,7 @@ public static String checkTemplateFormat(String path, String uripath) {
             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 "";
         }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static String checkTemplateFormat(String path, String uripath) {`
`57`	`57`	`return "";`
`58`	`58`	`}`
`59`	`59`	`// raw`
`60`		`- if ((output.contains("x86 boot") \|\| output.contains("data")) && (isCorrectExtension(uripath, "raw") \|\| isCorrectExtension(uripath, "img"))) {`
	`60`	`+ if ((output.contains("x86 boot") \|\| output.contains("DOS/MBR boot sector") \|\| output.contains("data")) && (isCorrectExtension(uripath, "raw") \|\| isCorrectExtension(uripath, "img"))) {`
`61`	`61`	`s_logger.debug("File at path " + path + " looks like a raw image :" + output);`
`62`	`62`	`return "";`
`63`	`63`	`}`