search for: update_appliance

...let appliance = match file_type with + | Uncompressed Empty | GZip Empty | XZ Empty -> + appliance | Uncompressed ((Packages|Hostfiles|Excludefiles) as t) -> let chan = open_in file in let lines = input_all_lines chan in @@ -294,7 +298,7 @@ and update_appliance appliance lines = function String.sub path 1 (n-1) ) lines in { appliance with excludefiles = appliance.excludefiles @ lines } - | Base_image -> assert false + | Base_image | Empty -> assert false (* Determine the [file_type] of [file], or exit with an error. *) and g...

...tch file_type with > + | Uncompressed Empty | GZip Empty | XZ Empty -> > + appliance > | Uncompressed ((Packages|Hostfiles|Excludefiles) as t) -> > let chan = open_in file in > let lines = input_all_lines chan in > @@ -294,7 +298,7 @@ and update_appliance appliance lines = function > String.sub path 1 (n-1) > ) lines in > { appliance with excludefiles = appliance.excludefiles @ lines } > - | Base_image -> assert false > + | Base_image | Empty -> assert false > > (* Determine the [file_type] of [file...

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

...pecified\n"; - exit 1; - ); + if inputs = [] then + error "build: no input supermin appliance specified"; (* When base images are seen, they are unpacked into this temporary * directory. But to speed things up, when we are building a chroot, @@ -297,10 +295,8 @@ and update_appliance appliance lines = function let lines = List.map ( fun path -> let n = String.length path in - if n < 1 || path.[0] <> '-' then ( - eprintf "supermin: excludefiles line does not start with '-'\n"; - exit 1 - )...

Hi, few cleanups in the supermin codebase; no actual functional change. Thanks, -- Pino Toscano (3): ext2: simplify tracking of visited modules utils: remove unused run_python function Add and use an helper error function src/build.ml | 20 +++++----------- src/dpkg.ml | 4 +--- src/ext2_initrd.ml | 10 ++++---- src/kernel.ml | 27

...; + + (* Depending on the file type, read or unpack the file. *) + let appliance = + match file_type with + | Uncompressed ((Packages|Hostfiles|Excludefiles) as t) -> + let chan = open_in file in + let lines = input_all_lines chan in + close_in chan; + update_appliance appliance lines t + | GZip ((Packages|Hostfiles|Excludefiles) as t) -> + let cmd = sprintf "zcat %s" (quote file) in + let lines = run_command_get_lines cmd in + update_appliance appliance lines t + | XZ ((Packages|Hostfiles|Excludefiles) as t) -> +...