[cloudstack] 04/12: Accept DOS/MBR as file format for ISO images as well

[bhaisaab]

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

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 4c68a0e96cb056832ac05b6e2953305ee26adee8
Author: Wido den Hollander <w...@widodh.nl>
AuthorDate: Thu Aug 10 14:57:40 2017 +0200

    Accept DOS/MBR as file format for ISO images as well
    
    Under Debian 7 the 'file' command would return:
    
      debian-9.1.0-amd64-netinst.iso: ISO 9660 CD-ROM filesystem data UDF 
filesystem data
    
    Under Debian 9 however it will return
    
      debian-9.1.0-amd64-netinst.iso: DOS/MBR boot sector
    
    This would make the HTTPTemplateDownloader in the Secondary Storage VM 
refuse the ISO as
    a valid template because it's not a correct format.
    
    Changes this behavior so that it accepts both.
    
    This allows us to use Debian 9 as a System VM template.
    
    Signed-off-by: Wido den Hollander <w...@widodh.nl>
---
 .../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 ed13360..e754a8e 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
@@ -81,7 +81,7 @@ public class ImageStoreUtil {
             return "";
         }
 
-        if (output.contains("ISO 9660") && isCorrectExtension(uripath, "iso")) 
{
+        if ((output.startsWith("ISO 9660") || output.startsWith("DOS/MBR")) && 
isCorrectExtension(uripath, "iso")) {
             s_logger.debug("File at path " + path + " looks like an iso : " + 
output);
             return "";
         }

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.