search for: expand_content

Some simple refactoring of virt-resize. I originally had the idea that we could turn virt-resize into a library (cf. virt-customize) and use it from virt-builder, but I now don't think that would make any meaningful difference. In particular we'd still have to open the handle the same number of times. These two patches are left over from my work on that. Rich.

...line character) of a file. *) + +val set_debug_gc : unit -> unit +(** Install an exit hook to check gc consistency for --debug-gc *) diff --git a/resize/resize.ml b/resize/resize.ml index 101b303..8ab14f7 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -152,7 +152,7 @@ let string_of_expand_content_method = function (* Main program. *) let main () = let infile, outfile, align_first, alignment, copy_boot_loader, - debug_gc, deletes, + deletes, dryrun, expand, expand_content, extra_partition, format, ignores, lv_expands, machine_readable, ntfsresize_force, output_format,...

...EPLY=( $( compgen -W "ignore warn error" -- "$cur") ) + return ;; esac case "$cur" in diff --git a/resize/resize.ml b/resize/resize.ml index 75bb2f7..ecb7cf0 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -149,13 +149,18 @@ let string_of_expand_content_method = function | BtrfsFilesystemResize -> s_"btrfs-filesystem-resize" | XFSGrowFS -> s_"xfs_growfs" +type unknown_filesystems_mode = + | UnknownFsIgnore + | UnknownFsWarn + | UnknownFsError + (* Main program. *) let main () = let infile, outfile, align_f...

...then error (f_"empty --expand option") - else if !expand <> "" then error (f_"--expand option given twice") + else if !expand <> "" then error (f_"--expand option given more than once") else expand := s in let expand_content = ref true in @@ -186,7 +186,7 @@ let main () = let shrink = ref "" in let set_shrink s = if s = "" then error (f_"empty --shrink option") - else if !shrink <> "" then error (f_"--shrink option given twice") + else i...

..._uri outfile) + with Invalid_argument "URI.parse_uri" -> + error (f_"error parsing URI '%s'. Look for error messages printed above.") + outfile in + infile, outfile, align_first, alignment, copy_boot_loader, deletes, dryrun, expand, expand_content, extra_partition, format, ignores, @@ -333,9 +340,12 @@ read the man page virt-resize(1). server = server; username = username; password = password } = infile in g#add_drive ?format ~readonly:true ~protocol ?server ?username ?secret:password path; + let _, { URI....

..."--delete", Arg.String (add deletes), s_"part" ^ " " ^ s_"Delete partition"; "--expand", Arg.String set_expand, s_"part" ^ " " ^ s_"Expand partition"; "--no-expand-content", Arg.Clear expand_content, " " ^ s_"Don't expand content"; diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index 8cd26a4..10c2767 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -59,7 +59,6 @@ let parse_cmdline () = "--check-tmpdir", Arg.String set_check_tmpdir, &...

...t-kernel\n"; exit 0 ); diff --git a/resize/resize.ml b/resize/resize.ml index 174f1c699..9d2fdaf40 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -157,7 +157,7 @@ let main () = let infile, outfile, align_first, alignment, copy_boot_loader, deletes, dryrun, expand, expand_content, extra_partition, format, ignores, - lv_expands, machine_readable, ntfsresize_force, output_format, + lv_expands, ntfsresize_force, output_format, resizes, resizes_force, shrink, sparse, unknown_fs_mode = let add xs s = List.push_front s xs in @@ -178,7 +178,6 @@ let main () =...

..._uri outfile) + with Invalid_argument "URI.parse_uri" -> + error (f_"error parsing URI '%s'. Look for error messages printed above.") + outfile in + infile, outfile, align_first, alignment, copy_boot_loader, deletes, dryrun, expand, expand_content, extra_partition, format, ignores, @@ -326,16 +333,25 @@ read the man page virt-resize(1). let btrfs_available = ref true in let xfs_available = ref true in + (* Add a drive to an handle using the elements of the URI, + * and few additional parameters. + *) + let add_drive_uri (g : Gu...

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

..._uri outfile) + with Invalid_argument "URI.parse_uri" -> + error (f_"error parsing URI '%s'. Look for error messages printed above.") + outfile in + infile, outfile, align_first, alignment, copy_boot_loader, deletes, dryrun, expand, expand_content, extra_partition, format, ignores, @@ -333,9 +340,12 @@ read the man page virt-resize(1). server = server; username = username; password = password } = infile in g#add_drive ?format ~readonly:true ~protocol ?server ?username ?secret:password path; + let _, { URI....

...s"; - [ "--delete" ], Getopt.String (s_"part", add deletes), s_"Delete partition"; - [ "--expand" ], Getopt.String (s_"part", set_expand), s_"Expand partition"; - [ "--no-expand-content" ], Getopt.Clear expand_content, s_"Don't expand content"; - [ "--no-extra-partition" ], Getopt.Clear extra_partition, s_"Don't create extra partition"; - [ "--format" ], Getopt.Set_string (s_"format", format), s_"Format of input disk"; - [ &q...

Introduce a new common helper to add the common options for libguestfs tools (short/long options, version, verbose, trace), and sort them. All the OCaml-based tools had these options already, so there are no functional changes in the interface they provide. The only difference is that now the options are always sorted, while some tools didn't had them like that previously: because of this, a

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

Version 1 of the patch, for discussion, but not to be applied. It does work, but needs a lot more testing. This removes all the psychopathic gettextify cruft, and replaces it with a 99 line Makefile.am. A large win, I think. The third patch implements gettext support in the OCaml tools. The fourth patch is just for illustration. It shows the consequent changes to libguestfs.pot and the po

...;--delete", Arg.String (add deletes), s_"part" ^ " " ^ s_"Delete partition"; > - "--expand", Arg.String set_expand, s_"part" ^ " " ^ s_"Expand partition"; > - "--no-expand-content", Arg.Clear expand_content, " " ^ s_"Don't expand content"; > - "--no-extra-partition", Arg.Clear extra_partition, " " ^ s_"Don't create extra partition"; > - "--format", Arg.Set_string format, s_"format" ^ " " ^ s_&q...

..."--delete", Arg.String (add deletes), s_"part" ^ " " ^ s_"Delete partition"; - "--expand", Arg.String set_expand, s_"part" ^ " " ^ s_"Expand partition"; - "--no-expand-content", Arg.Clear expand_content, " " ^ s_"Don't expand content"; - "--no-extra-partition", Arg.Clear extra_partition, " " ^ s_"Don't create extra partition"; - "--format", Arg.Set_string format, s_"format" ^ " " ^ s_"Format...

..."--delete", Arg.String (add deletes), s_"part" ^ " " ^ s_"Delete partition"; - "--expand", Arg.String set_expand, s_"part" ^ " " ^ s_"Expand partition"; - "--no-expand-content", Arg.Clear expand_content, " " ^ s_"Don't expand content"; - "--no-extra-partition", Arg.Clear extra_partition, " " ^ s_"Don't create extra partition"; - "--format", Arg.Set_string format, s_"format" ^ " " ^ s_"Format...

..."--delete", Arg.String (add deletes), s_"part" ^ " " ^ s_"Delete partition"; - "--expand", Arg.String set_expand, s_"part" ^ " " ^ s_"Expand partition"; - "--no-expand-content", Arg.Clear expand_content, " " ^ s_"Don't expand content"; - "--no-extra-partition", Arg.Clear extra_partition, " " ^ s_"Don't create extra partition"; - "--format", Arg.Set_string format, s_"format" ^ " " ^ s_"Format...