similar to: [PATCH] sysprep: Enable the network, add --no-network to disable it

In commit ae6f726ecc3bc1b67fd76e51a7b1e1a33d4dcfc0 we started to use the virt-customize code to replace various virt-sysprep operations. This had the effect of adding many more possible operationg to virt-sysprep, but some of them (specifically --install) did not work unless the appliance network is enabled. It was not enabled in virt-sysprep, so these operations never worked. This change

Nikita, Please take a look at the attached patch. I have rewritten it a little, and only lightly tested it. Rich.

In commit ae6f726ecc3bc1b67fd76e51a7b1e1a33d4dcfc0 we started to use the virt-customize code to replace various virt-sysprep operations. This had the effect of adding many more possible operations to virt-sysprep, but some of them (specifically --install) did not work unless the appliance network is enabled. It was not enabled in virt-sysprep, so these operations never worked. This change does

On Friday 10 January 2014 10:09:19 Richard W.M. Jones wrote: > On Thu, Jan 09, 2014 at 03:45:54PM +0000, Richard W.M. Jones wrote: > > On Thu, Jan 09, 2014 at 04:21:10PM +0100, Pino Toscano wrote: > > > + and set_operations op_string = > > > + let currentopset = > > > + match (!operations) with > > > > No need for parentheses around

Add a no-op --no-selinux-relabel option, to be compatible with virt-sysprep < 1.26. --- sysprep/main.ml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysprep/main.ml b/sysprep/main.ml index ea94728..f32c4ad 100644 --- a/sysprep/main.ml +++ b/sysprep/main.ml @@ -140,6 +140,8 @@ let main () = "--list-operations", Arg.Unit list_operations, " " ^ s_"List

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.

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.

Add a new Getopt module to mllib, to parse command line arguments with handlers close to the ones used with Arg, but using getopt(3) (actually getopt_long_only) to do the real parsing. This allow us to provide options for OCaml tools with a syntax similar to the C tools, and use the additional features getopt offers and Arg does not. Do a single-step conversion of Common_utils and all the OCaml

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

Make print_version_and_exit, long_options, display_short_options, and display_long_options private, as set_standard_options now takes care of handling the job for the common command line options. --- mllib/common_utils.mli | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index 79032bc..24f8f83 100644 --- a/mllib/common_utils.mli +++

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

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

Add a new Getopt module to mllib, to parse command line arguments with handlers close to the ones used with Arg, but using getopt(3) (actually getopt_long_only) to do the real parsing. This allow us to provide options for OCaml tools with a syntax similar to the C tools, and use the additional features getopt offers and Arg does not. Getopt now handles every part of the command line handling,

Followup of ed4bcb119cb908e98ecc1107dcd8b740ee2f484f. --- sysprep/sysprep_operation_delete.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation_delete.ml b/sysprep/sysprep_operation_delete.ml index 59d5485..a08d4d0 100644 --- a/sysprep/sysprep_operation_delete.ml +++ b/sysprep/sysprep_operation_delete.ml @@ -40,7 +40,10 @@ let op = {

Followup of ed4bcb119cb908e98ecc1107dcd8b740ee2f484f. --- sysprep/sysprep_operation_delete.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sysprep/sysprep_operation_delete.ml b/sysprep/sysprep_operation_delete.ml index 59d5485..3db3f57 100644 --- a/sysprep/sysprep_operation_delete.ml +++ b/sysprep/sysprep_operation_delete.ml @@ -40,7 +40,12 @@ let op = {

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

This removes tmp files under /tmp and /var/tmp. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 1 + sysprep/sysprep_operation_tmp_files.ml | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 sysprep/sysprep_operation_tmp_files.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index

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.