git.annexia.org
/
virt-p2v.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixes to CCISS support.
[virt-p2v.git]
/
virt-p2v
diff --git
a/virt-p2v
b/virt-p2v
index
954f035
..
67cd4cf
100755
(executable)
--- a/
virt-p2v
+++ b/
virt-p2v
@@
-689,7
+689,7
@@
let get_all_block_devices () =
let devices = devices @ get "sd" filter in
(* Search for cciss. *)
let devices = devices @ get "sd" filter in
(* Search for cciss. *)
- let rex = Pcre.regexp "^cciss!c(\\d
)d(\\d
)$" in
+ let rex = Pcre.regexp "^cciss!c(\\d
+)d(\\d+
)$" in
let filter name =
try
let subs = Pcre.exec ~rex name in
let filter name =
try
let subs = Pcre.exec ~rex name in
@@
-2052,7
+2052,8
@@
let rec main ttyname =
let () =
printf (f_ "\nSending /dev/%s (%.3f GB) to remote machine\n\n%!")
let () =
printf (f_ "\nSending /dev/%s (%.3f GB) to remote machine\n\n%!")
- origin_dev ((Int64.to_float size) /. (1024.*.1024.*.1024.)) in
+ (dev_of_block_device origin_dev)
+ ((Int64.to_float size) /. (1024.*.1024.*.1024.)) in
(* Open the snapshot device. *)
let fd = openfile ("/dev/mapper/" ^ snapshot_dev) [O_RDONLY] 0 in
(* Open the snapshot device. *)
let fd = openfile ("/dev/mapper/" ^ snapshot_dev) [O_RDONLY] 0 in