similar to: [supermin PATCH v2 0/3] Better handle no config files

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

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 file_content = | Packages | Hostfiles | Excludefiles +| Empty let rec string_of_file_type = function |

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

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

This is just refactoring, with no behaviour changes. --- src/mode_prepare.ml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml index 7c8221e..7759c58 100644 --- a/src/mode_prepare.ml +++ b/src/mode_prepare.ml @@ -128,28 +128,28 @@ let prepare debug (copy_kernel, format, host_cpu, * be

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

tar defaults to 10K as block size, and thus it pads the created archives to multiples of that size using zero's. Hence, when creating an archive with no files, it will be 10K zero's, that is compressed by gzip, resulting in few bytes. The issue happens later, during the build phase: base.tar.gz is correctly detected as gz, and zcat is run to detect its content: since the empty tar was

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

Hi Rich But there is no src/kernel.ml file on my ubuntu powerpc to which the above patch is reffering. I have installed supermin as supermin_5.1.8-2_powerpc.deb debian package. Thanks On Tue, Jun 3, 2014 at 7:16 PM, Richard W.M. Jones <rjones@redhat.com> wrote: > On Tue, Jun 03, 2014 at 06:55:49PM +0530, abhishek jain wrote: > > supermin: failed to find a suitable kernel

While trying to run libguestfs tests after building with "--enable-appliance --with-supermin-extra-options=--use-installed", I ran into a peculiar error message in the c-api test: ,---- | libguestfs: error: strings: /abssymlink: strings: error while loading | shared libraries: libbfd-2.24-multiarch.so: cannot open shared object | file: No such file or directory `---- The problem here

--- configure.ac | 1 + src/config.ml.in | 1 + src/dpkg.ml | 1 + 3 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 2141540..99ea913 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ AC_PATH_PROG(APT_GET,[apt-get],[no]) AC_PATH_PROG(DPKG,[dpkg],[no]) AC_PATH_PROG(DPKG_DEB,[dpkg-deb],[no]) AC_PATH_PROG(DPKG_QUERY,[dpkg-query],[no])

Hi Rich Kindly ignore my previos mail. I have downloaded the latest version of supermin supermin-5.1.8 and have compiled it for powerpc.Moreover there was no need to patch the src/ kernel.ml file as the changes were already implemented on the latest version. But still when i run libguestfs-test-tool on powerpc ubuntu,I get the below logs.. libguestfs-test-tool

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

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

This patch series fixes several problems in the way that supermin handles kernels. The most pressing problem is that supermin doesn't handle bogus vmlinuz files which aren't actual kernels. Along the way there is a lot of clean up. The patches look much better if you view them with ‘-w’. This series will require plenty of time to be tested in Fedora, especially on non-x86 arches.

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

On Fri, Apr 03, 2020 at 12:20:57PM +0200, Pino Toscano wrote: > 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. Patches 1, 2 and 4 are fine. I have a minor problem with this patch:

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

--- src/build.ml | 43 ++++++++++++++++++++++++++----------------- src/chroot.ml | 12 +++++++----- src/dpkg.ml | 17 +++++++++++++++-- src/ext2.ml | 8 +++++++- 4 files changed, 55 insertions(+), 25 deletions(-) diff --git a/src/build.ml b/src/build.ml index 9225184..205701b 100644 --- a/src/build.ml +++ b/src/build.ml @@ -106,11 +106,7 @@ let rec build debug *) let files =

--- 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".