search for: extra_argspec

...a/sysprep/sysprep_operation.ml > +++ b/sysprep/sysprep_operation.ml > @@ -172,7 +172,7 @@ let extra_args () = > assert !baked; > > List.flatten ( > - List.map (fun { extra_args = extra_args } -> > + List.map (fun { extra_args } -> > List.map (fun { extra_argspec = argspec } -> argspec) extra_args The last line here can be also simplified too? -- Pino Toscano

...move."); +Use the I<--delete> option to specify a path to remove. + +You can use shell glob characters in the specified path; note that such +metacharacters might require proper escape. For example: + + virt-sysprep --delete '/var/log/*.log'."); extra_args = [ { extra_argspec = ("--delete", Arg.String add_paths, s_"path" ^ " " ^ s_"File or directory to be removed on guest"); extra_pod_argval = Some "PATHNAME"; -- 1.8.3.1

...on.ml b/sysprep/sysprep_operation.ml > index 057c8c5..8ffe2c7 100644 > --- a/sysprep/sysprep_operation.ml > +++ b/sysprep/sysprep_operation.ml > @@ -49,7 +49,7 @@ type operation = { > perform_on_devices : device_side_effects callback option; > } > and extra_arg = { > - extra_argspec : Arg.key * Arg.spec * Arg.doc; > + extra_argspec : Getopt.keys * Getopt.spec * Getopt.doc; > extra_pod_argval : string option; > extra_pod_description : string; > } > @@ -208,27 +208,33 @@ let dump_pod_options () = > let args = List.map ( > function > |...

...;); diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml index 057c8c5..8ffe2c7 100644 --- a/sysprep/sysprep_operation.ml +++ b/sysprep/sysprep_operation.ml @@ -49,7 +49,7 @@ type operation = { perform_on_devices : device_side_effects callback option; } and extra_arg = { - extra_argspec : Arg.key * Arg.spec * Arg.doc; + extra_argspec : Getopt.keys * Getopt.spec * Getopt.doc; extra_pod_argval : string option; extra_pod_description : string; } @@ -208,27 +208,33 @@ let dump_pod_options () = let args = List.map ( function | (op_name, - { extra_argspec = (ar...

...;); diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml index 73020d5..c5d8e77 100644 --- a/sysprep/sysprep_operation.ml +++ b/sysprep/sysprep_operation.ml @@ -49,7 +49,7 @@ type operation = { perform_on_devices : device_side_effects callback option; } and extra_arg = { - extra_argspec : Arg.key * Arg.spec * Arg.doc; + extra_argspec : Getopt.keys * Getopt.spec * Getopt.doc; extra_pod_argval : string option; extra_pod_description : string; } @@ -208,27 +208,33 @@ let dump_pod_options () = let args = List.map ( function | (op_name, - { extra_argspec = (ar...

...specified files or directories. -Use the I<--delete> option to specify a path to remove."); +Use the I<--delete> option to specify a path to remove. + +You can use shell glob characters in the specified path, i.e. +C</some/dir/prefix*>."); extra_args = [ { extra_argspec = ("--delete", Arg.String add_paths, s_"path" ^ " " ^ s_"File or directory to be removed on guest"); extra_pod_argval = Some "PATHNAME"; -- 1.8.3.1

...;); diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml index 73020d5..b4d650f 100644 --- a/sysprep/sysprep_operation.ml +++ b/sysprep/sysprep_operation.ml @@ -49,7 +49,7 @@ type operation = { perform_on_devices : device_side_effects callback option; } and extra_arg = { - extra_argspec : Arg.key * Arg.spec * Arg.doc; + extra_argspec : Getopt.keys * Getopt.spec * Getopt.doc; extra_pod_argval : string option; extra_pod_description : string; } @@ -208,30 +208,37 @@ let dump_pod_options () = let args = List.map ( function | (op_name, - { extra_argspec = (ar...

...pt.OptionName open Sysprep_operation @@ -129,7 +130,7 @@ B<Note:> This is different from I<--firstboot> scripts (which run in the context of the guest when it is booting first time). I<--script> scripts run on the host, not in the guest."); extra_args = [ - { extra_argspec = [ "--scriptdir" ], Getopt.String (s_"dir", set_scriptdir), s_"Mount point on host"; + { extra_argspec = [ L"scriptdir" ], Getopt.String (s_"dir", set_scriptdir), s_"Mount point on host"; extra_pod_argval = Some "SCRIPT...

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.

Hi, this series improves virt-dib, adding some upstream changes, and refactoring the handling of output formats. Thanks, Pino Toscano (6): dib: clear up "already provided" message dib: add --checksum dib: pass custom mkfs options after the filesystem type dib: refactor output formats handling dib: clarify "output:" lines in --machine-readable documentation dib:

Adapt the globbing part from the old --remote-path work previously proposed for sysprep [1], allowing --delete to perform globbing when deleting paths. [1] https://www.redhat.com/archives/libguestfs/2013-October/msg00045.html --- sysprep/sysprep_operation_delete.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation_delete.ml

Setting timezone is easy. It turns out to be almost impossible to set keyboard layout in virt-builder sanely, so I have added some examples instead. Coming up next, setting languages in virt-builder (clue: very very very hard). Rich.

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))

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

.../output_format.ml index 537469ab6..79a90ae35 100644 --- a/dib/output_format.ml +++ b/dib/output_format.ml @@ -106,7 +106,7 @@ let extra_args () = assert !baked; List.flatten ( - List.map (fun { extra_args = extra_args } -> + List.map (fun { extra_args } -> List.map (fun { extra_argspec = argspec } -> argspec) extra_args ) !all_formats ) diff --git a/generator/GObject.ml b/generator/GObject.ml index 94499fa13..9d4d6b2fa 100644 --- a/generator/GObject.ml +++ b/generator/GObject.ml @@ -33,7 +33,7 @@ open Utils let generate_header = generate_header ~inputs:["genera...

Hi, currently /etc/shadow is edited manually when needed (i.e. when setting the password for an user), and it is not changed when removing users. Import the upstream shadow.aug (currently in their development serie, but not part of any released version yet), and use it only when the augeas version is less than a potential 1.2.1 (covering also the case when the new version is just 1.3.0). Pino

--- sysprep/sysprep_operation.mli | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation.mli b/sysprep/sysprep_operation.mli index 61dde72..eb89db4 100644 --- a/sysprep/sysprep_operation.mli +++ b/sysprep/sysprep_operation.mli @@ -16,14 +16,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -(** Structure used to describe sysprep

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.