From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 4 Oct 2011 19:00:42 +0000 (+0100)
Subject: sparsify: Fix --ignore option to work on canonical device names.
X-Git-Tag: 1.13.18~4
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=b0605f265be3f501930516ff95deab2910ced3ac

sparsify: Fix --ignore option to work on canonical device names.
---

diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
index 89a2c13..4782983 100644
--- 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