sparsify: Add auto-detection of .vdi files.

[libguestfs.git] / sparsify / sparsify.ml

diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
index 89a2c13..956fccb 100644 (file)
--- a/sparsify/sparsify.ml
+++ b/sparsify/sparsify.ml
@@ -177,10 +177,15 @@ let () =
   let filesystems = g#list_filesystems () in
   let filesystems = List.map fst filesystems in
   let filesystems = List.sort compare filesystems in
+
+  let is_ignored fs =
+    let fs = canonicalize fs in
+    List.exists (fun fs' -> fs = canonicalize fs') ignores
+  in
+
   List.iter (
     fun fs ->
-      if not (List.mem fs ignores) then (
-
+      if not (is_ignored fs) then (
         let mounted =
           try g#mount_options "" fs "/"; true
           with _ -> false in
@@ -269,6 +274,8 @@ let output_format =
       );
       if string_prefix line "QEMU QCOW Image (v2)" then
         "qcow2"
+      else if string_find line "VirtualBox" >= 0 then
+        "vdi"
       else
         "raw" (* XXX guess *)