similar to: [PATCH] customize/perl_edit-c.c: Don't use internal APIs.

We can now use the Guestfs.c_pointer method to access the underlying guestfs_h *. So no need to use internal APIs for this. --- customize/perl_edit-c.c | 18 ++++++------------ customize/perl_edit.ml | 10 ++++++++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/customize/perl_edit-c.c b/customize/perl_edit-c.c index 753d990..7191bef 100644 --- a/customize/perl_edit-c.c +++

On Tuesday 12 April 2016 08:41:37 Richard W.M. Jones wrote: > We can now use the Guestfs.c_pointer method to access the underlying > guestfs_h *. So no need to use internal APIs for this. > --- > customize/perl_edit-c.c | 18 ++++++------------ > customize/perl_edit.ml | 10 ++++++++-- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git

In v1 of this patch, there was the (small) possibility that 'g' might have been garbage collected while we were in the C function. Avoid this by passing 'g' to the function as well as the C pointer, so that 'g' is pinned as a garbage collector root [by CAMLparam5] so it cannot be collected while we're in the function. Rich.

Hi, this series does a couple of code reorganizations/refactoring in code used by tools: the windows path handling code, and the two types of file editing (using editor, and using perl expression). There's still a code duplication between the two variants of file editing, but it is just within a single source, and can be easily solved now (planning as next step). Pino Toscano (13): edit:

In Debian/Ubuntu systems, read the previous hostname from /etc/hostname before replacing it, and try to carefully replace it in /etc/hosts with the new hostname. Since Perl_edit to edit /etc/hosts, it is added/changed as dependency for Hostname. --- builder/Makefile.am | 2 +- mllib/Makefile.am | 2 +- mllib/hostname.ml | 22 ++++++++++++++++++++++ sysprep/Makefile.am | 1 + 4 files

Make use of the new copy-attributes command to properly copy all file attributes from a file to the new version of it. --- builder/perl_edit.ml | 29 +--------------------------- edit/edit.c | 49 ++--------------------------------------------- fish/edit.c | 54 ++-------------------------------------------------- 3 files changed, 5 insertions(+), 127 deletions(-) diff --git

Don't pass these flags to dozens of functions. --- builder/builder.ml | 47 +++++++++-------- builder/cache.ml | 4 +- builder/cache.mli | 2 +- builder/cmdline.ml | 13 ++--- builder/downloader.ml | 14 +++-- builder/downloader.mli

Resolve also symlinks when checking whether a path passed to --edit is a file: the file editing code supports symlinks anyway (properly changes the target file, instead of overwrite the symlink with a real file), so it is safe to allow this operation in customize/builder. --- customize/customize_run.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize/customize_run.ml

Easy way to parse JSON from a file, without reading it all to string first. --- common/mltools/JSON_parser-c.c | 25 +++++++++++++++++++++++++ common/mltools/JSON_parser.ml | 1 + common/mltools/JSON_parser.mli | 3 +++ common/mltools/JSON_parser_tests.ml | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/common/mltools/JSON_parser-c.c

On Tuesday 12 April 2016 08:41:37 Richard W.M. Jones wrote: > We can now use the Guestfs.c_pointer method to access the underlying > guestfs_h *. So no need to use internal APIs for this. > --- LGTM. Did it cause any particular issue? (Not that it is a problem, just to know whether it was doing anything problematic.) Thanks, -- Pino Toscano

Just did a git pull to the below commit (to get the latest version 1.25.37) and did a local build, this is what I see: Error: The files ../ocaml/guestfs.cmi and perl_edit.cmi make inconsistent assumptions over interface Guestfs Haven't investigated further, thought I'd post it here first: $ git rev-parse --short HEAD 838a3c9 $ ./autogen.sh $

Use an helper struct for holding the ext2_filsys variable, so that can be used to add more data. --- src/ext2fs-c.c | 77 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/src/ext2fs-c.c b/src/ext2fs-c.c index 70755c9..8eab24c 100644 --- a/src/ext2fs-c.c +++ b/src/ext2fs-c.c @@ -52,6 +52,11 @@ /* fts.h in glibc is broken,

Because this 'feature' is broken (since 2013): https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 we have to replace all instances of $(top_srcdir) in *_SOURCES lines with a relative path. According to what I read, this shouldn't break split builds, but I didn't test it. The only things automake moans about now are: * Unescaped left brace in regex is deprecated, passed

This implements the --selinux-relabel option for virt-customize, virt-builder and virt-sysprep. There is no need to autorelabel functionality now. Thanks: Stephen Smalley --- builder/Makefile.am | 1 + builder/virt-builder.pod | 20 +++++++++---------- customize/Makefile.am | 2 ++ customize/SELinux_relabel.ml | 46 +++++++++++++++++++++++++++++++++++++++++++

This adds a customize option: virt-customize --ssh-inject USER virt-customize --ssh-inject USER:string:KEY_STRING virt-customize --ssh-inject USER:file:FILENAME (ditto for virt-builder and virt-sysprep) In each case this injects into the guest user USER a) the current (host) user's ssh pubkey b) the key specified as KEY_STRING c) the key in FILENAME adding it to

--- v2v/Makefile.am | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 03f818c..0dd9d9b 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -97,12 +97,7 @@ SOURCES_ML = \ v2v.ml SOURCES_C = \ - $(top_srcdir)/fish/progress.c \ - $(top_srcdir)/fish/file-edit.c \ - $(top_srcdir)/mllib/progress-c.c \

Add simple operations for RHEL guests using subscription-manager, so it is possible to e.g. install software on them. --- builder/Makefile.am | 1 + builder/virt-builder.pod | 47 ++++++++++++++++++ customize/Makefile.am | 2 + customize/customize_run.ml | 34 +++++++++++++ customize/subscription_manager.ml | 53 ++++++++++++++++++++

Since all the usage of augeas is done in OCaml parts (via ocaml-augeas), drop all the C code using the C augeas library. --- daemon/Makefile.am | 2 - daemon/augeas.c | 91 --------------------------------------------- daemon/cleanups.c | 11 ------ daemon/daemon.h | 34 ----------------- daemon/lvm-filter.c | 2 - docs/C_SOURCE_FILES | 1 - po/POTFILES | 1 - 7 files

Since all the usage of augeas is done in OCaml parts (via ocaml-augeas), drop all the C code using the C augeas library. --- daemon/Makefile.am | 2 - daemon/augeas.c | 91 --------------------------------------------- daemon/cleanups.c | 11 ------ daemon/daemon.h | 34 ----------------- daemon/lvm-filter.c | 2 - docs/C_SOURCE_FILES | 1 - po/POTFILES | 1 - 7 files

Add simple operations for RHEL guests using subscription-manager, so it is possible to e.g. install software on them. --- customize/Makefile.am | 8 +++- customize/customize_run.ml | 58 ++++++++++++++++++++++++++ generator/customize.ml | 101 +++++++++++++++++++++++++++++++++++++++++++++ sysprep/Makefile.am | 8 +++- 4 files changed, 173 insertions(+), 2 deletions(-) diff