search for: list_mode

...r/cmdline.ml index 7b33013..eee8367 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -148,7 +148,7 @@ let parse_cmdline () = "--gpg", Arg.Set_string gpg, "gpg" ^ " " ^ s_"Set GPG binary/command"; "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; "--list", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format short"; +...

...1 in let memsize = ref None in let set_memsize arg = memsize := Some arg in @@ -256,7 +263,9 @@ let parse_cmdline () = "--link", Arg.String add_link, "target:link.." ^ " " ^ s_"Create symbolic links"; "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; "--list", Arg.Unit list_mode, ditto; - "--long", Arg.Unit list_set_long, " " ^ s_"List available templates, in long textual form"; + "--long", Arg.Unit lis...

Hi, This small patch serie adds a JSON output for virt-builder. This way it is possible to parse the list of available templates, with no need to parse the unstructured and possibly changing short and long outputs of virt-builder. Pino Toscano (3): builder: small refactor of the list output builder: add --list-format builder: add a JSON output for --list builder/builder.ml

...t;, attach_disk), s_"Attach data disk/ISO during install"; @@ -144,7 +145,7 @@ let parse_cmdline () = [ "--gpg" ], Getopt.Set_string ("gpg", gpg), s_"Set GPG binary/command"; [ "-l"; "--list" ], Getopt.Unit list_mode, s_"List available templates"; [ "--long" ], Getopt.Unit list_set_long, s_"Shortcut for --list-format long"; - [ "--list-format" ], Getopt.String ("short|long|json", list_set_format), + [ "--list-format" ], Getopt.S...

These patches fix a few compiler warnings. Tested on top of commit aee0dc5565711ef5be7c30fb5fc1c5f3f98db09f Jonathan Boeing (6): Use z width specifier when printing size_t variable pxe: fix truncation warning gpllib: fix sizeof(char *) misuse hdt: fix sizeof(char *) misuse hdt: fix sizeof(char *) misuse hdt: fix sizeof(char *) misuse com32/gpllib/dmi/dmi.c | 24 +++---

On error, point also to the man page of the current tool in addition to '$TOOL --help'. --- mllib/getopt-c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mllib/getopt-c.c b/mllib/getopt-c.c index bf40f91..3efd5d3 100644 --- a/mllib/getopt-c.c +++ b/mllib/getopt-c.c @@ -69,8 +69,8 @@ cleanup_option_list (void *ptr) static void __attribute__((noreturn))

...`Short | "long" -> `Long + | "json" -> `Json | fmt -> eprintf (f_"%s: invalid --list-format type '%s', see the man page.\n") prog fmt; exit 1 in @@ -265,7 +266,7 @@ let parse_cmdline () = "--list", Arg.Unit list_mode, ditto; "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format short"; "--list-format", Arg.String list_set_format, - "short|long" ^ " " ^ s_"Set the for...

...e, > - "image" ^ " " ^ s_"Get kernel from image"; > - "--gpg", Arg.Set_string gpg, "gpg" ^ " " ^ s_"Set GPG binary/command"; > - "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; > - "--list", Arg.Unit list_mode, " " ^ s_"List available templates"; > - "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format long&quo...

...get_kernel_mode, - "image" ^ " " ^ s_"Get kernel from image"; - "--gpg", Arg.Set_string gpg, "gpg" ^ " " ^ s_"Set GPG binary/command"; - "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--list", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format long"; - &...

...t_format : [`Short|`Long|`Json]; + memsize : int option; + network : bool; + ops : Customize_cmdline.ops; + output : string option; + size : int64 option; + smp : int option; + sources : (string * string) list; + sync : bool; +} + let parse_cmdline () = let mode = ref `Install in let list_mode () = mode := `List in @@ -293,7 +316,11 @@ read the man page virt-builder(1). { ops with ops = ops.ops @ [ `RootPassword pw ] } ) in - mode, arg, - arch, attach, cache, check_signature, curl, - delete_on_failure, format, gpg, list_format, memsize, - network, ops, output, size, smp...

The second patch is obviously not complete yet - for discussion only. Rich.

...; ], Getopt.Unit get_kernel_mode, s_"Get kernel from image"; - [ "--gpg" ], Getopt.Set_string ("gpg", gpg), s_"Set GPG binary/command"; - [ "-l"; "--list" ], Getopt.Unit list_mode, s_"List available templates"; - [ "--long" ], Getopt.Unit list_set_long, s_"Shortcut for --list-format long"; - [ "--list-format" ], Getopt.String ("short|long|json", list_set_format), + [ L"gpg" ], Getopt.Set_str...

...get_kernel_mode, - "image" ^ " " ^ s_"Get kernel from image"; - "--gpg", Arg.Set_string gpg, "gpg" ^ " " ^ s_"Set GPG binary/command"; - "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--list", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format long"; - &...

...get_kernel_mode, - "image" ^ " " ^ s_"Get kernel from image"; - "--gpg", Arg.Set_string gpg, "gpg" ^ " " ^ s_"Set GPG binary/command"; - "-l", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--list", Arg.Unit list_mode, " " ^ s_"List available templates"; - "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format long"; - &...

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.

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing