search for: mode_build

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

...-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 kernel/initrd/root as outputs (RHBZ#1813809) src/mode_build.ml | 22 ++++++++++++-- src/mode_build.mli | 4 +++ src/mode_prepare.ml | 9 +++++- src/mode_prepare.mli | 4 +++ src/supermin.ml | 11 +++++-- tests/Makefile.am | 3 +- tests/test-if-newer-ext2.sh | 57 ++++++++++++++++++++++++++++++++++++...

...d - squash patch with stub for the build mode and patch with the build mode files together Pino Toscano (4): build: factor ext2 filenames Tighten Unix_error check for missing outputdir Act on --if-newer only for build mode build: check for outputs in --if-newer check (RHBZ#1813809) src/mode_build.ml | 22 ++++++++++++-- src/mode_build.mli | 4 +++ src/supermin.ml | 10 ++++--- tests/Makefile.am | 3 +- tests/test-if-newer-ext2.sh | 57 +++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 8 deletions(-) create mode 100755 tests/...

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 +++++++-- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/mode_build.ml b/src/mode_build.ml index d54a3cd..4a58460 100644 --- a/src/mode...

...he 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 | 4 +++ src/supermin.ml | 6 ++-- tests/Makefile.am | 3 +- tests/test-if-newer-ext2.sh | 57 +++++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 3 deletions(-) create mode 100755 tests/test-if-n...

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 file_content = > | Packages > | Hostfiles...

...of a reproducer in the commit message - patch #3 changed approach, from "create really empty" to "not create at all" Pino Toscano (3): build: ignore empty files prepare: keep config_files available for longer prepare: do not create base.tar.gz with no config files src/mode_build.ml | 7 +++- src/mode_prepare.ml | 83 +++++++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 38 deletions(-) -- 2.17.2

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

...ot -f chroot and see if /tmp/root/usr/lib64/libiconv.so.2 is being copied from the host. To find out why it's not working, keep adding -v options to the supermin command line to enable more and more debug, and compare it to the source: https://github.com/libguestfs/supermin/blob/master/src/mode_build.ml#L85 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM...

...ed 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 Thu, Apr 18, 2019 at 10:58 AM Pino Toscano <ptoscano@redhat.com> wrote: > On Thursday, 18 April 2019 11:53:39 CEST Richard W.M. Jones wrote: > > Workaround for Ubuntu which uses this script to try to start a systemd > > service. That won't work because system...

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

...+236,15 @@ appliance automatically. > *) > if if_newer then ( > try > - let odate = (lstat outputdir).st_mtime in > + let mode_outputs = > + match mode with > + | Prepare -> Mode_prepare.get_outputs args inputs > + | Build -> Mode_build.get_outputs args inputs in We actually document that --if-newer can only be used in build mode. It sort of makes no sense in prepare mode. So shouldn't this just give an error (either here, or earlier) if we're in prepare mode? Rich. > + let mode_outputs = List.map ((//) outputd...