similar to: [PATCH 1/2] dib: Make the interface between cmdline.ml and dib.ml explicit.

virt-dib is a new tool to run the elements of diskimage-builder using libguestfs. --- More or less stable now, although with debug stuff here and there; needs initial review, for being included. I would like to have it reviewed at this point, so it can be broadly used. TODO items open: - improve the documentation - review - getting more testing (although it has been successfully tested for

virt-dib is a new tool to run the elements of diskimage-builder using libguestfs. --- .gitignore | 5 + Makefile.am | 3 +- appliance/packagelist.in | 12 + configure.ac | 1 + dib/Makefile.am | 144 ++++++++ dib/cmdline.ml | 242 +++++++++++++ dib/dib.ml | 920 +++++++++++++++++++++++++++++++++++++++++++++++

virt-dib is a new tool to run the elements of diskimage-builder using libguestfs. --- I would like to have it reviewed at this point, so it can be used. Documentation and code can be improved and polished following feedback. .gitignore | 5 + Makefile.am | 3 +- appliance/packagelist.in | 7 + configure.ac | 1 + dib/Makefile.am | 144

virt-dib is a new tool to run the elements of diskimage-builder using libguestfs. --- Work in progress (debug stuff here and there), although I've submitting it for initial review, for being included later when polished for good. TODO items open: - move Uname from builder to mllib - improve the documentation - review - getting more testing (although it has been successfully tested for

d-i-b 2.0 is written in Python, and thus it passes the information about the interpreter used for it (sys.executable) to the scripts that need it; this mechanism replaces the old discovery of what is the default Python interpreter in the system. Since we are not Python-based, look for 'python' and use it as default interpreter, with the --python command line option to set a different one.

Instead of running them before lanching the appliance with the disks and then uploading the result after root.d hooks run, mount the root in the local temporary directory using FUSE and then run the hooks on the guest. Other than being closer to what diskimage-builder does, it also avoids issues with the extra-data.d scripts assuming to find things already, and we don't error out while trying

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:

--- dib/dib.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dib/dib.ml b/dib/dib.ml index 4a0c9ee..06a1f67 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -467,7 +467,7 @@ let main () = let elements = if cmdline.is_ramdisk then [cmdline.ramdisk_element] @ elements else elements in - message (f_"Elements: %s") (String.concat " "

On Tue, Jun 16, 2015 at 12:15:22PM +0200, Pino Toscano wrote: [...] There is some trailing whitespace on one line. 'git show' should highlight it. > diff --git a/appliance/packagelist.in b/appliance/packagelist.in > index 76c7293..a4f814b 100644 > --- a/appliance/packagelist.in > +++ b/appliance/packagelist.in > @@ -255,5 +255,12 @@ zerofree > >

Hi, this series start to implement some of the changes needed to support d-i-b 2.0; normal VM distro builds seem to work correctly, ramdisk builds are still broken and require more efforts. Thanks, Pino Toscano (5): dib: implement get_image_element_array stuff dib: export IMAGE_BLOCK_DEVICE_WITHOUT_PART dib: extract get_required_tool out of require_tool dib: require a Python interpreter

On Tuesday 30 June 2015 20:14:24 Richard W.M. Jones wrote: > On Tue, Jun 16, 2015 at 12:15:22PM +0200, Pino Toscano wrote: > [...] > > There is some trailing whitespace on one line. 'git show' should > highlight it. Fixed, thanks. > > diff --git a/appliance/packagelist.in b/appliance/packagelist.in > > index 76c7293..a4f814b 100644 > > ---

Move the OCaml binding to C _exit to an own module. Just code motion, adapting v2v in the process. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 5 ++++- mllib/exit-c.c | 33 +++++++++++++++++++++++++++++++++ mllib/exit.ml | 19 +++++++++++++++++++ mllib/exit.mli | 20 ++++++++++++++++++++ v2v/Makefile.am | 1 - v2v/changeuid-c.c | 33

Make use of the helper provided by Tools_utils.create_standard_options, so there is no need to implement the logic in each tool. This affects all the OCaml tools with --machine-readable, namely: virt-builder, virt-builder-repository, virt-dib, virt-get-kernel, virt-resize, virt-sparsify, and virt-v2v. --- builder/cmdline.ml | 8 ++------ builder/repository_main.ml | 6 ++----

Just stylistic change, no functional change. --- dib/dib.ml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dib/dib.ml b/dib/dib.ml index 06a1f67..35ae6b7 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -781,9 +781,8 @@ let main () = ) @ mkfs_options @ [ "-t"; cmdline.fs_type; blockdev ] in ignore (g#debug "sh" (Array.of_list ([ "mkfs" ]

Hi, this patch series does changes mostly in virt-dib, few bug fixes and a couple of new features (mostly implemented upstream already). In addition, one new API is added, and a new optional argument for an existing API is added (the latter is not needed, but could be useful anyway). Thanks, Pino Toscano (10): dib: fix listing envvars in fake-sudo dib: source dib "die" script in

Since Std_utils.which can handle relative/absolute paths, remove the manual checks, and use Std_utils.which directly. --- common/mltools/tools_utils.ml | 4 +--- dib/cmdline.ml | 12 +----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml index 3c7e1b846..24641369e 100644 ---

This is just a straight refactoring. Various ad hoc string_* functions that appeared in Common_utils have been renamed and placed in the String.* namespace. The old vs "new" functions are: string_prefix -> String.is_prefix string_suffix -> String.is_suffix string_find -> String.find replace_str -> String.replace string_nsplit -> String.nsplit string_split

Instead of creating Guestfs handles and manually apply common options (e.g. debug and trace), use the open_guestfs in Common_utils. This also applies the common options to handles which didn't set them before, so we can inspect also their messages if needed. --- builder/builder.ml | 8 ++------ customize/customize_main.ml | 4 +--- dib/dib.ml | 4 +---

Implement the "squash" output format, i.e. a squashfs compressed filesystem. This was implemented in diskimage-builder upstream as commit 9d13084c4183b63587e1f5e4b03395a8df6538f6. --- dib/Makefile.am | 1 + dib/output_format_squashfs.ml | 39 +++++++++++++++++++++++++++++++++++++++ dib/utils.ml | 1 + dib/virt-dib.pod | 6 ++++++ 4 files

--- builder/cmdline.ml | 61 +++++++-------- dib/cmdline.ml | 57 +++++++------- generator/customize.ml | 29 +++---- get-kernel/get_kernel.ml | 17 +++-- mllib/common_utils.ml | 15 ++-- mllib/getopt.ml | 121 +++++++++++++++--------------- mllib/getopt.mli