search for: disk_resize

...version step to a real format. *) - else if output_size > old_size && is_not `Template && List.mem_assoc `Format itags then ( + else if output_size > old_size && is_not `Template + && List.mem_assoc `Format itags then tr `Disk_resize 60 ((`Size, Int64.to_string output_size) :: itags); - tr `Disk_resize 60 ((`Size, Int64.to_string output_size) :: itags); - ); (* qemu-img convert is always possible, and quicker. It doesn't * resize, but it does change the format. -- 2.5.0

...if Sys.file_exists infile then infile else Filename.dirname infile in + let outfile = + if Sys.file_exists outfile then outfile else Filename.dirname outfile in + + match task with + | `Virt_resize -> 100 (* virt-resize is a special case*) + | (`Copy|`Move|`Pxzcat|`Disk_resize|`Convert) as task -> + if StatVFS.filesystem_is_remote infile || + StatVFS.filesystem_is_remote outfile + then 80 (* NFS etc. *) + else ( + let inst = lstat infile in + let outst = lstat outfile in + let across = inst.st_dev <&g...

v2 -> v3: - Drop gnulib fallback.

It started out as "this'll be just a simple fix ..." and turned into something a bit over-engineered in the end. Here it is anyway. Rich.

v1 -> v2: - Removed the f_type field from StatVFS.statvfs structure. - New function StatVFS.filesystem_is_remote, written in C. [Thinking about it, this should probably be called ?is_network_filesystem?, but I can change that before pushing]. - Use statvfs instead of fstatvfs, and statfs instead of fstatfs. - Rejigged the comments in builder/builder.ml to make them simpler

...nd ]) @ + (match lvexpand with + | None -> [] + | Some lvexpand -> [ "--lv-expand"; lvexpand ]) @ + [ "--unknown-filesystems"; "error"; ifile; ofile ] in + if run_command (Array.of_list cmd) <> 0 then exit 1 | itags, `Disk_resize, otags -> let ofile = List.assoc `Filename otags in diff --git a/builder/cache.ml b/builder/cache.ml index 9d056a1..becf73a 100644 --- a/builder/cache.ml +++ b/builder/cache.ml @@ -25,8 +25,8 @@ open Unix open Printf let clean_cachedir dir = - let cmd = sprintf "rm -rf %s"...

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

...; "" | Some lvexpand -> sprintf " --lv-expand %s" (quote lvexpand)) (quote ifile) (quote ofile) in - if verbose () then printf "%s\n%!" cmd; + debug "%s" cmd; if Sys.command cmd <> 0 then exit 1 | itags, `Disk_resize, otags -> @@ -609,7 +609,7 @@ let main () = (human_size osize); let cmd = sprintf "qemu-img resize %s %Ld%s" (quote ofile) osize (if verbose () then "" else " >/dev/null") in - if verbose () then printf "%s\n%!" cmd; +...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

...| Some lvexpand -> sprintf " --lv-expand %s" (quote lvexpand)) (quote ifile) (quote ofile) in - if verbose then printf "%s\n%!" cmd; + if verbose () then printf "%s\n%!" cmd; if Sys.command cmd <> 0 then exit 1 | itags, `Disk_resize, otags -> @@ -581,8 +580,8 @@ let main () = msg (f_"Resizing container (but not filesystems) to expand the disk to %s") (human_size osize); let cmd = sprintf "qemu-img resize %s %Ld%s" - (quote ofile) osize (if verbose then "" else &quo...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623