search for: customize_cmdline

Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- mlcustomize/customize_cmdline.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml index c062379879e2..67e85af2ad93 100644 --- a/mlcustomize/customize_cmdline.ml +++ b/mlcustomize/customize_cmdline.ml @@ -481,6 +481,7 @@ let rec argspec () = ] in le...

...t; From: Martin Kletzander <mkletzan@redhat.com> > > The first split does not care about the whole string, it is just trying to get > the command name in front, so triml is just right. > > Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > --- > mlcustomize/customize_cmdline.ml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml > index c062379879e2..abd21a4cbca5 100644 > --- a/mlcustomize/customize_cmdline.ml > +++ b/mlcustomize/customize_cmdline.ml > @@ -481,6 +481,7 @@ let...

..., Jan 23, 2020 at 12:16:50PM +0100, Martin Kletzander wrote: > >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > > I forgot to mention this is trying to fix the following BZ: > > https://bugzilla.redhat.com/show_bug.cgi?id=1351000 > >--- > >mlcustomize/customize_cmdline.ml | 1 + > >1 file changed, 1 insertion(+) > > > >diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml > >index c062379879e2..67e85af2ad93 100644 > >--- a/mlcustomize/customize_cmdline.ml > >+++ b/mlcustomize/customize_cmdline.ml >...

...gt;>> >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> >>> >>> I forgot to mention this is trying to fix the following BZ: >>> >>> https://bugzilla.redhat.com/show_bug.cgi?id=1351000 >> >>> >--- >>> >mlcustomize/customize_cmdline.ml | 1 + >>> >1 file changed, 1 insertion(+) >>> > >>> >diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml >>> >index c062379879e2..67e85af2ad93 100644 >>> >--- a/mlcustomize/customize_cmdline.ml >>>...

On Thu, Jan 23, 2020 at 12:16:50PM +0100, Martin Kletzander wrote: >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> I forgot to mention this is trying to fix the following BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1351000 >--- > mlcustomize/customize_cmdline.ml | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml >index c062379879e2..67e85af2ad93 100644 >--- a/mlcustomize/customize_cmdline.ml >+++ b/mlcustomize/customize_cmdline.ml >@@ -481,6 +481,7 @@ let rec ar...

...0100, Martin Kletzander wrote: >> >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> >> >> I forgot to mention this is trying to fix the following BZ: >> >> https://bugzilla.redhat.com/show_bug.cgi?id=1351000 > >> >--- >> >mlcustomize/customize_cmdline.ml | 1 + >> >1 file changed, 1 insertion(+) >> > >> >diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml >> >index c062379879e2..67e85af2ad93 100644 >> >--- a/mlcustomize/customize_cmdline.ml >> >+++ b/mlcustomize/cu...

...0100, Martin Kletzander wrote: >> >Signed-off-by: Martin Kletzander <mkletzan@redhat.com> >> >> I forgot to mention this is trying to fix the following BZ: >> >> https://bugzilla.redhat.com/show_bug.cgi?id=1351000 > >> >--- >> >mlcustomize/customize_cmdline.ml | 1 + >> >1 file changed, 1 insertion(+) >> > >> >diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml >> >index c062379879e2..67e85af2ad93 100644 >> >--- a/mlcustomize/customize_cmdline.ml >> >+++ b/mlcustomize/cu...

The first split does not care about the whole string, it is just trying to get the command name in front, so triml is just right. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- mlcustomize/customize_cmdline.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml index c062379879e2..abd21a4cbca5 100644 --- a/mlcustomize/customize_cmdline.ml +++ b/mlcustomize/customize_cmdline.ml @@ -481,6 +481,7 @@ let rec argspec () = ] in le...

...tzan@redhat.com> > > > > The first split does not care about the whole string, it is just trying to get > > the command name in front, so triml is just right. > > > > Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > > --- > > mlcustomize/customize_cmdline.ml | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml > > index c062379879e2..abd21a4cbca5 100644 > > --- a/mlcustomize/customize_cmdline.ml > > +++ b/mlcustomize/customize_cmdline.m...

I got a little way into this. The two attached patches are preliminary work. My proposed split is: libguestfs.git common -> git submodule libguestfs-common.git generator/ lib/ all language bindings C based tools (eg. virt-df, virt-edit, guestfish) guestfs-tools.git common -> git submodule libguestfs-common.git

Doing this allows us to remove the Customize_utils module completely, since it becomes empty. Rich.

...7994 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -42,7 +42,7 @@ type cmdline = { delete_on_failure : bool; format : string option; gpg : string; - list_format : [`Short|`Long|`Json]; + list_format : List_entries.format; memsize : int option; network : bool; ops : Customize_cmdline.ops; @@ -88,15 +88,13 @@ let parse_cmdline () = let format = ref "" in let gpg = ref "gpg" in - let list_format = ref `Short in - let list_set_long () = list_format := `Long in + let list_format = ref List_entries.Short in + let list_set_long () = list_format := List...

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

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

...n/mlvisit/' | \ grep -v '^v2v/config.ml$$' | \ + grep -v -E '.*_tests\.ml$$' | \ LC_ALL=C sort > $@-t mv $@-t $@ diff --git a/po/POTFILES-ml b/po/POTFILES-ml index dae9bd1a..7512d63b 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -3,32 +3,23 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.ml common/mlpcre/PCRE.ml -common/mlpcre/pcre_tests.ml common/mlstdutils/guestfs_config.ml common/mlstdutils/std_utils.ml -common/mlstdutils/std_utils_tests.ml common/mlstdutils/stringMap.ml common/mlstdutils/stringSet.ml com...

...100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -125,6 +125,7 @@ BOBJECTS = \ $(top_builddir)/customize/crypt.cmo \ $(top_builddir)/customize/password.cmo \ $(top_builddir)/customize/ssh_key.cmo \ + $(top_builddir)/customize/subscription_manager.cmo \ $(top_builddir)/customize/customize_cmdline.cmo \ $(top_builddir)/customize/customize_run.cmo \ $(SOURCES_ML:.ml=.cmo) diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index 41cda1a..b4a341f 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -844,6 +844,53 @@ F<C:\Program Files\Red Hat\Firstboot\lo...

Hi, this is the v2 of a series introducing basic support for registering/attaching/unregistering RHEL guests using subscription-manager, so it is possible to do for example: $ virt-customize -a rhel-guest.qcow2 \ --sm-credentials user:file:/path/to/password-file --sm-register \ --sm-attach file:/path/to/pool-file \ --install pkg1 --install pkg2 .. \ --sm-remove --sm-unregister

...$(top_builddir)/customize/perl_edit.cmo \ $(top_builddir)/customize/crypt.cmo \ $(top_builddir)/customize/password.cmo \ + $(top_builddir)/customize/SELinux_relabel.cmo \ $(top_builddir)/customize/ssh_key.cmo \ $(top_builddir)/customize/subscription_manager.cmo \ $(top_builddir)/customize/customize_cmdline.cmo \ diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index 91c1114..29a67a9 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -1756,20 +1756,21 @@ two possible strategies it can use to ensure correct labelling: =item Using I<--selinux-relabel> -Thi...

...x 414279f..206abce 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -111,6 +111,7 @@ deps = \ $(top_builddir)/customize/crypt-c.o \ $(top_builddir)/customize/crypt.cmx \ $(top_builddir)/customize/password.cmx \ + $(top_builddir)/customize/ssh_key.cmx \ $(top_builddir)/customize/customize_cmdline.cmx \ $(top_builddir)/customize/customize_run.cmx \ $(top_builddir)/fish/guestfish-uri.o \ diff --git a/builder/cmdline.ml b/builder/cmdline.ml index c0584f7..e21d5bb 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -306,8 +306,8 @@ read the man page virt-builder(1). | `Co...

...g; + arch : string; + attach : (string option * string) list; + cache : string option; + check_signature : bool; + curl : string; + delete_on_failure : bool; + format : string option; + gpg : string; + list_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 wi...