diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-13 20:36:40 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-13 23:07:26 +0100 |
| commit | 46ed232dc2ff2f7dff91cd93a13d7ce6f2cec504 (patch) | |
| tree | 7ac4657b5067f50597aa54e2ee4d74d2db6c3054 /sparsify | |
| parent | 998ebc333dbfe40c5953e36fb42f9610727a7532 (diff) | |
| download | libguestfs-46ed232dc2ff2f7dff91cd93a13d7ce6f2cec504.tar.gz libguestfs-46ed232dc2ff2f7dff91cd93a13d7ce6f2cec504.tar.xz libguestfs-46ed232dc2ff2f7dff91cd93a13d7ce6f2cec504.zip | |
New API: guestfs_canonical_device_name.
This API makes device names canonical, eg. /dev/vda1 -> /dev/sda1.
Diffstat (limited to 'sparsify')
| -rw-r--r-- | sparsify/sparsify.ml | 4 | ||||
| -rw-r--r-- | sparsify/utils.ml | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml index 600a9e5f..ec3512a9 100644 --- a/sparsify/sparsify.ml +++ b/sparsify/sparsify.ml @@ -214,8 +214,8 @@ let () = let filesystems = List.sort compare filesystems in let is_ignored fs = - let fs = canonicalize fs in - List.exists (fun fs' -> fs = canonicalize fs') ignores + let fs = g#canonical_device_name fs in + List.exists (fun fs' -> fs = g#canonical_device_name fs') ignores in List.iter ( diff --git a/sparsify/utils.ml b/sparsify/utils.ml index dd27ba88..5c999712 100644 --- a/sparsify/utils.ml +++ b/sparsify/utils.ml @@ -112,20 +112,6 @@ let error fs = in ksprintf display fs -(* The reverse of device name translation, see - * BLOCK DEVICE NAMING in guestfs(3). - *) -let canonicalize dev = - if String.length dev >= 8 && - dev.[0] = '/' && dev.[1] = 'd' && dev.[2] = 'e' && dev.[3] = 'v' && - dev.[4] = '/' && (dev.[5] = 'h' || dev.[5] = 'v') && dev.[6] = 'd' then ( - let dev = String.copy dev in - dev.[5] <- 's'; - dev - ) - else - dev - let feature_available (g : Guestfs.guestfs) names = try g#available names; true with G.Error _ -> false |