search for: sysprep_operation

Hi Rich, I tried to implement the logging feature, but I can't though compiling with this patch now, could you please give me some comments? The error message is below, --- ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX -package unix -I ../src/.libs -I ../ocaml -c sysprep_operation.ml -o sysprep_operation.cmx File "sysprep_operation.ml", line 1, characters 0-1: Error: The implementation sysprep_operation.ml does not match the interface sysprep_operation.cmi: Type declarations do not match: type operation = { name : string;...

...= > if string_prefix op_name "-" then > `Remove (String.sub op_name 1 (String.length op_name-1)) > else > `Add op_name > match op with > > | `Add "" | `Remove "" -> (* error *) > | `Add "defaults" -> Sysprep_operation.add_defaults_to_set opset > | `Remove "defaults" -> Sysprep_operation.remove_defaults_from_set > | opset etc > > The type of op will be [ `Add of string | `Remove of string ]. > Actually you never need to write that type out, as OCaml will infer it > (and check...

Add a new --operation parameter which, similarly to --enable, can be used to enable operations, but also to remove them, and to add/remove the default operations and all the available ones. --- sysprep/main.ml | 36 +++++++++++++++++++++++++++ sysprep/sysprep_operation.ml | 24 ++++++++++++++++++ sysprep/sysprep_operation.mli | 21 ++++++++++++++++ sysprep/virt-sysprep.pod | 57 +++++++++++++++++++++++++++++++++++++------ 4 files changed, 131 insertions(+), 7 deletions(-) diff --git a/sysprep/main.ml b/sysprep/main.ml index 689a394..49750a9 100644 --- a/sy...

s/rathern/rather Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- sysprep/sysprep_operation.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml index 5bc1efa..af2004e 100644 --- a/sysprep/sysprep_operation.ml +++ b/sysprep/sysprep_operation.ml @@ -279,7 +279,7 @@ let perform_operations_on_filesystems ?opera...

Add a short paragraph about SELinux, mostly to point to the documentation about it provided in the documentation of virt-builder. --- customize/virt-customize.pod | 8 ++++++++ sysprep/virt-sysprep.pod | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/customize/virt-customize.pod b/customize/virt-customize.pod index a666be7..8dbdfef 100644 --- a/customize/virt-customize.pod +++

...); > + match !n with This can be written a bit more naturally as ... let n, remove = if string_prefix op_name "-" then String.sub op_name 1 (String.length op_name-1), true else op_name, false in match n with ... > + let f = if remove then Sysprep_operation.remove_defaults_from_set else Sysprep_operation.add_defaults_to_set in > + f opset You can actually write: (if remove then Sysprep_operation.remove_defaults_from_set else Sysprep_operation.add_defaults_to_set) opset I don't know which way you think is clearer, but I would av...

...ile on OCaml < 3.12. Oops, sorry. Considering it was not reported so far, I guess we do not have many users left on old OCaml versions (old distros, actually). OOC, did you use a script to detect all these occurrences, or did you just manually scan through the code? > diff --git a/sysprep/sysprep_operation.ml b/sysprep/sysprep_operation.ml > index 5c5640c67..1be5941c1 100644 > --- 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_arg...

...sprep: ca-certificates: request system CA store update sysprep: add FreeIPA offline unenrollment (RHBZ#1789592) customize/customize_run.ml | 48 ++------------ sysprep/Makefile.am | 1 + sysprep/main.ml | 5 ++ sysprep/sysprep_operation.ml | 3 + sysprep/sysprep_operation.mli | 2 + sysprep/sysprep_operation_ca_certificates.ml | 8 ++- sysprep/sysprep_operation_unenroll_freeipa.ml | 65 +++++++++++++++++++ sysprep/utils.ml | 32 +++++++++ sysprep/utils.mli...

Remove the ca certificates. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 62 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..c6292cc 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6...

Remove the bash history of users in home directory, and history of root. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_bash_history.ml | 44 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sysprep/sysprep_operation_bash_history.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 8730bc0..3a48702 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -33,6 +3...

--- customize/customize_main.ml | 5 ++--- dib/dib.ml | 5 ++--- resize/resize.ml | 13 ++----------- sysprep/sysprep_operation.ml | 5 +---- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/customize/customize_main.ml b/customize/customize_main.ml index e161e82..13d40bc 100644 --- a/customize/customize_main.ml +++ b/customize/customize_main.ml @@ -166,9 +166,8 @@ read the man page virt-customize(1). (* C...

In the TODO file there's a discussion of perhaps writing a new 'virt-customize' tool. I think it's probably better (or at any rate, easier) to just add this functionality into virt-sysprep. That is what this small series of patches aims to achieve. Note these are not very well tested at the moment. The first patch adds a generic and useful '--firstboot' flag. The

--- 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, Bos...

remove the automatically generated abrt data. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- po/POTFILES-ml | 1 + sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_abrt_data.ml | 47 ++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 sysprep/sysprep_operation_abrt_data.ml diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 0adfb8e..1622bf2 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -10,6 +10,7 @@ sparsify/utils.m...

On Tuesday 07 January 2014 12:12:43 Richard W.M. Jones wrote: > On Tue, Jan 07, 2014 at 11:16:08AM +0100, Pino Toscano wrote: > > On Friday 27 December 2013 10:58:15 you wrote: > > > virt-sysprep either runs with all default operations or a selected > > > list of operations with the --enable argument. A few times I've > > > found I'd like to use the

...hat's done. Please consider to add logging feature what was done at virt-sysprep. For example, deleted /var/log/utmp deleted /etc/..... modified /etc/sysconfing/network... ... What do you think? Thanks, Wanlong Gao Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- sysprep/sysprep_operation_cron_spool.ml | 2 ++ sysprep/sysprep_operation_dhcp_client_state.ml | 2 ++ sysprep/sysprep_operation_dhcp_server_state.ml | 2 ++ sysprep/sysprep_operation_hostname.ml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/sysprep/sysprep_operation_cron_spool.ml b/sysp...

This patch is incomplete but it illustrates the idea. virt-sysprep is rewritten as a modular tool in OCaml. Only the 'utmp' and 'hostname' operations are implemented at the moment. 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

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

...natural way to write this is: let op = if string_prefix op_name "-" then `Remove (String.sub op_name 1 (String.length op_name-1)) else `Add op_name match op with | `Add "" | `Remove "" -> (* error *) | `Add "defaults" -> Sysprep_operation.add_defaults_to_set opset | `Remove "defaults" -> Sysprep_operation.remove_defaults_from_set opset | etc The type of op will be [ `Add of string | `Remove of string ]. Actually you never need to write that type out, as OCaml will infer it (and check it). It will only appear in...