search for: read_appli

...57,7 @@ and string_of_file_content = function | Packages -> "packages" | Hostfiles -> "hostfiles" | Excludefiles -> "excludefiles" + | Empty -> "(empty)" let rec build debug (copy_kernel, format, host_cpu, @@ -250,6 +252,8 @@ and read_appliance debug basedir appliance = function (* Depending on the file type, read or unpack the file. *) let appliance = match file_type with + | Uncompressed Empty | GZip Empty | XZ Empty -> + appliance | Uncompressed ((Packages|Hostfiles|Excludefiles) as t) ->...

...ction > | Packages -> "packages" > | Hostfiles -> "hostfiles" > | Excludefiles -> "excludefiles" > + | Empty -> "(empty)" > > let rec build debug > (copy_kernel, format, host_cpu, > @@ -250,6 +252,8 @@ and read_appliance debug basedir appliance = function > (* Depending on the file type, read or unpack the file. *) > let appliance = > match file_type with > + | Uncompressed Empty | GZip Empty | XZ Empty -> > + appliance > | Uncompressed ((Packages|Hostfil...

--- src/utils.ml | 21 +++++++++++++++++++++ src/utils.mli | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/utils.ml b/src/utils.ml index 3e81c21..7ae24bd 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -204,3 +204,24 @@ let compare_architecture a1 a2 = exit 1 in compare (index_of_architecture a1) (index_of_architecture a2) + +(* Parse a size field, eg. "10G".

...Kernel.build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb in - Ext2.build_ext2 debug basedir files modpath kernel_version appliance; + Ext2.build_ext2 debug basedir files modpath kernel_version appliance size; Ext2_initrd.build_initrd debug tmpdir modpath initrd and read_appliance debug basedir appliance = function diff --git a/src/ext2.ml b/src/ext2.ml index d5c26a7..79539a3 100644 --- a/src/ext2.ml +++ b/src/ext2.ml @@ -23,26 +23,27 @@ open Utils open Ext2fs open Package_handler -(* The ext2 image that we build always has a fixed size, and we 'hope' - * tha...

This is a "merge" of two previous series: https://www.redhat.com/archives/libguestfs/2018-December/msg00015.html https://www.redhat.com/archives/libguestfs/2018-December/msg00020.html The goal is to handle better situations like: - empty file in the appliance directory - no config files available in the packages to include in an appliance Compared to the two series, the changes are: -

Hi, to ease debugging issues with appliances (e.g. when used in libguestfs), using --include-packagelist will add a file containing the list of all the packages used. Thanks, Pino Toscano (3): ext2: add ext2fs_chmod and ext2fs_chown chroot: factor out file copy code Add --include-packagelist src/build.ml | 42 +++++++++++++++++++++++++------ src/chroot.ml | 29

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...rmat with + | Chroot -> + outputdir + | Ext2 -> + let basedir = tmpdir // "base.d" in + mkdir basedir 0o755; + basedir in + + (* Read the supermin appliance, ie. the input files and/or + * directories that make up the appliance. + *) + let appliance = read_appliance debug basedir empty_appliance inputs in + + (* Resolve dependencies in the list of packages. *) + let ph = get_package_handler () in + let packages = filter_map ph.ph_package_of_string appliance.packages in + let packages = + let packages = package_set_of_list packages in + ph.ph_get_...