similar to: [supermin PATCH] build: ignore empty files

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

On Mon, Dec 03, 2018 at 04:32:19PM +0100, Pino Toscano wrote: > Do not error out on empty files, just ignore them. > --- > src/mode_build.ml | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/src/mode_build.ml b/src/mode_build.ml > index b5f5fa6..9cd0a21 100644 > --- a/src/mode_build.ml > +++ b/src/mode_build.ml > @@ -46,6 +46,7 @@ and

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the ext2 output format of the build mode. Changes from v1: - drop empty stub for the prepare mode - add patch to ignore --if-newer on modes different than build - squash patch with stub for the build mode

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the build mode, and for its ext2 output format. Pino Toscano (4): build: factor ext2 filenames Tighten Unix_error check for missing outputdir Extend modes with list of outputs build: set

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

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

I had tried this approach, to add /etc/dhcp/dhclient-enter-hooks.d/resolved to excludefiles, however it didn't work. As far as I know, this hook is included in the base image and according to [1], the current implementation does not apply excludefiles to the base image. Jo [1] https://github.com/libguestfs/supermin/blob/b2401285cd3e3d42006fc164ef1f046cc35a50c4/src/mode_build.ml#L137 On

See patch #2 for more explanation. Pino Toscano (2): prepare: keep config_files available for longer prepare: create a really empty base.tar.gz with no config files src/mode_prepare.ml | 87 +++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 35 deletions(-) -- 2.17.2

Workaround for Ubuntu which uses this script to try to start a systemd service. That won't work because systemd is not used inside the appliance. See: https://bugs.launchpad.net/ubuntu/+source/supermin/+bug/1824236 Thanks: Ioanna Alifieraki --- appliance/init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appliance/init b/appliance/init index 4f2b55822..b1c4d09ea

Add a function for each mode to return the list of potential outputs, so that the existance/timestamp checks done for --if-newer can take those into accounts. At the moment both modes return no outputs, so there is no behaviour change. --- src/mode_build.ml | 7 +++++++ src/mode_build.mli | 4 ++++ src/mode_prepare.ml | 9 ++++++++- src/mode_prepare.mli | 4 ++++ src/supermin.ml | 9

In case we need to check whether the appliance must be rebuilt, check also the timestamp of the outputs of the mode, i.e. the kernel, initrd, and root files. This way, when either of these files does not exist or is older than the package manager DB we can rebuild the appliance. Add a simple test to verify this behaviour. --- src/mode_build.ml | 12 ++++++++ src/mode_build.mli

Simplier version of what is implemented in Common_utils in libguestfs, only adding the application prefix and handling the exit. --- src/build.ml | 20 +++++----------- src/dpkg.ml | 4 +--- src/kernel.ml | 27 ++++++++++------------ src/package_handler.ml | 7 +++--- src/pacman.ml | 6 ++--- src/prepare.ml | 12 ++++------ src/rpm.ml

Greetings, I have the following typical scenario: given one or more qcow2 base images I clone them with COW and start the VMs. At a certain point I'd like to inspect them in order to see their evolution compared to the known base images. To do so I was thinking about taking a disk snapshot of each VM and inspect its content through libguestfs (using it's Python bindings). Obviously I

On Mon, Mar 23, 2015 at 10:41:01PM +0000, Richard W.M. Jones wrote: > On Mon, Mar 23, 2015 at 04:34:21PM +0200, NoxDaFox wrote: > > Greetings, > > > > I have the following typical scenario: given one or more qcow2 base images > > I clone them with COW and start the VMs. > > > > At a certain point I'd like to inspect them in order to see their evolution

Since v1: - Don't remove the whole of /var/log - Cleanups and fixes to appliance/Makefile.am

Brings the size of the appliance down to 95 MB [xz-compressed], which is the same as for libguestfs 1.28. --- appliance/excludefiles.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appliance/excludefiles.in b/appliance/excludefiles.in index d3c66cc..a63eca9 100644 --- a/appliance/excludefiles.in +++ b/appliance/excludefiles.in @@ -22,6 +22,9 @@ dnl The right kernel modules are added

--- appliance/excludefiles.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/appliance/excludefiles.in b/appliance/excludefiles.in index 9a48db7..c53a913 100644 --- a/appliance/excludefiles.in +++ b/appliance/excludefiles.in @@ -32,12 +32,7 @@ dnl The right kernel modules are added back by supermin. -/usr/share/i18n/* -/usr/share/pkgconfig/* --/var/log/*.log*

I also sorted the list. Between libguestfs 1.28 and 1.30, the appliance grew from 95MB to 213MB. Using guestmount and filelight (see link below) I could see that the main contributor was these two directories, which should not be necessary. With this change, the size goes down to 119MB. See also: https://rwmj.wordpress.com/2015/07/23/why-has-the-libguestfs-appliance-grown-by-118-mb/ ---

Brings the size of the appliance down to 95 MB [xz-compressed], which is the same as for libguestfs 1.28. --- appliance/excludefiles.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appliance/excludefiles.in b/appliance/excludefiles.in index d3c66cc..574c828 100644 --- a/appliance/excludefiles.in +++ b/appliance/excludefiles.in @@ -22,6 +22,11 @@ dnl The right kernel modules are added

It normally makes no difference to the final size of the appliance, because 'supermin --build' will copy back the host kernel modules. --- appliance/excludefiles.in | 1 + 1 file changed, 1 insertion(+) diff --git a/appliance/excludefiles.in b/appliance/excludefiles.in index 574c828..181b182 100644 --- a/appliance/excludefiles.in +++ b/appliance/excludefiles.in @@ -21,6 +21,7 @@ dnl Of