search for: align_first

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.

...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, resizes, resizes_force, shrink, sparse = @@ -162,7 +162,6 @@ let main () = let ali...

...(* outfile can be a URI. *) + let outfile = + try (outfile, URI.parse_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 ~rea...

...ne_readable then ( + if machine_readable () then ( printf "virt-get-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 =...

...(* outfile can be a URI. *) + let outfile = + try (outfile, URI.parse_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 t...

...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_first, alignment, copy_boot_loader, deletes, dryrun, expand, expand_content, extra_partition, format, ignores, lv_expands, machine_readable, ntfsresize_force, output_format, - resizes, resizes_force, shrink, sparse = + resizes, resizes_force, shrink, sparse, unknown_fs_mode =...

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

...(* outfile can be a URI. *) + let outfile = + try (outfile, URI.parse_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 ~rea...

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

...th Invalid_argument "URI.parse_uri" -> - error (f_"error parsing URI '%s'. Look for error messages printed above.") + error (f_"error parsing URI '%s'. Look for error messages printed above") infile in infile, outfile, align_first, alignment, copy_boot_loader, @@ -406,7 +406,7 @@ read the man page virt-resize(1). | "msdos" -> MBR, "msdos" | "gpt" -> GPT, "gpt" | _ -> - error (f_"%s: unknown partition table type\nvirt-resize only supports MBR (DOS) and...

...f open Common_utils open Common_gettext.Gettext +open Getopt.OptionName module G = Guestfs @@ -183,26 +184,26 @@ let main () = let unknown_fs_mode = ref "warn" in let argspec = [ - [ "--align-first" ], Getopt.Set_string (s_"never|always|auto", align_first), s_"Align first partition (default: auto)"; - [ "--alignment" ], Getopt.Set_int (s_"sectors", alignment), s_"Set partition alignment (default: 128 sectors)"; - [ "--no-copy-boot-loader" ], Getopt.Clear copy_boot_loader, s_"Don'...

...ize/resize.ml index 8ab14f7..f353158 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -189,7 +189,7 @@ let main () = let sparse = ref true in let ditto = " -\"-" in - let argspec = Arg.align [ + let argspec = [ "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)"; "--alignment", Arg.Set_int alignment, s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)"; "--no-copy-boot-loader&q...

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.

...e.ml > +++ b/resize/resize.ml > @@ -182,35 +182,28 @@ let main () = > let sparse = ref true in > let unknown_fs_mode = ref "warn" in > > - let ditto = " -\"-" in > let argspec = [ > - "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)"; > - "--alignment", Arg.Set_int alignment, s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)"; > - "--no-copy-boo...

...386ce..e40ce60 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -182,35 +182,28 @@ let main () = let sparse = ref true in let unknown_fs_mode = ref "warn" in - let ditto = " -\"-" in let argspec = [ - "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)"; - "--alignment", Arg.Set_int alignment, s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)"; - "--no-copy-boot-loader&q...

...2f1b7..566076b 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -182,35 +182,28 @@ let main () = let sparse = ref true in let unknown_fs_mode = ref "warn" in - let ditto = " -\"-" in let argspec = [ - "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)"; - "--alignment", Arg.Set_int alignment, s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)"; - "--no-copy-boot-loader&q...

...2f1b7..185f5a0 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -182,37 +182,29 @@ let main () = let sparse = ref true in let unknown_fs_mode = ref "warn" in - let ditto = " -\"-" in let argspec = [ - "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)"; - "--alignment", Arg.Set_int alignment, s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)"; - "--no-copy-boot-loader&q...

v2 -> v3: - Changes to the Curl API suggested by Pino.