similar to: [PATCH] inspect: fix inspection of partition-less devices (RHBZ#1661038)

This is essentially a line-for-line translation of the C inspection code. --- daemon/Makefile.am | 8 + daemon/inspect.ml | 396 +++++++++++++++++++++ daemon/inspect.mli | 41 +++ daemon/inspect_fs.ml | 363 +++++++++++++++++++ daemon/inspect_fs.mli | 23 ++ daemon/inspect_fs_unix.ml | 745

This is essentially a line-for-line translation of the C inspection code. --- daemon/Makefile.am | 8 + daemon/inspect.ml | 396 ++++++++++++++++++++ daemon/inspect.mli | 41 ++ daemon/inspect_fs.ml | 363 ++++++++++++++++++ daemon/inspect_fs.mli | 23 ++ daemon/inspect_fs_unix.ml | 788

From: Nikolay Ivanets <stenavin@gmail.com> Inspection code checks /etc/mdadm.conf to map MD device paths listed in mdadm.conf to MD device paths in the guestfs appliance. However on some operating systems (e.g. Ubuntu) mdadm.conf has alternative location: /etc/mdadm/mdadm.conf. This patch consider an alternative location of mdadm.conf as well. --- daemon/inspect_fs_unix_fstab.ml | 13

If the /etc/fstab of a guest contains devices specified with UUID or LABEL, then the new OCaml inspection code will report the findfs failure as general failure of the inspection. OTOH, the old C inspection code simply ignored all the devices that cannot be resolved. Hence, restore the old behaviour by ignoring unresolvable devices. --- daemon/inspect_fs_unix_fstab.ml | 12 ++++++++++-- 1 file

This way the Lvm module contains only the OCaml implementations of LVM daemon APIs. This is simple refactoring, with no functional changes. --- daemon/Makefile.am | 2 ++ daemon/findfs.ml | 2 +- daemon/inspect_fs_unix_fstab.ml | 2 +- daemon/lvm.ml | 27 ----------------------- daemon/lvm.mli | 10 --------- daemon/lvm_utils.ml

No change, just reposting without the "for discussion" tag. I think we should allow this as it seems like a nice coding style for a limited subset of imperative-style code. Rich.

When rewriting the heavily imperative original inspection code, I longed for a ‘return’ statement so I could keep the new code as close as possible to the original. OCaml of course does not have such a statement, but it's relatively simply to implement it in the language. The first patch does so, and the second patch rewrites a sample of the inspection code to use it. Rich.

On Wed, Aug 02, 2017 at 12:33:14PM +0200, Pino Toscano wrote: > Hi, > > (replying here since v2 of the series does not have this explanation.) > > On Tuesday, 1 August 2017 16:00:15 CEST Richard W.M. Jones wrote: > > We'd like to use PCRE instead of the awful Str module. However I > > don't necessarily want to pull in the extra dependency of ocaml-pcre, >

Add a mapping for the Hurd device names, so it is possible to enable the inspection of /etc/fstab. --- src/inspect-fs-unix.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 3f57cd5..b629508 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -78,6 +78,7 @@ static pcre

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

Make a best effort try to map NetBSD disklabel partitions to Linux partitions. The mapping will be incorrect if there is a gap in the disklabel partitions sequence, e.g. 'b' (swap) partition is missing but 'e' partition is defined. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/inspect-fs-unix.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26

Make a best effort try to map NetBSD disklabel partitions to Linux partitions. The mapping will be incorrect if there is a gap in the disklabel partitions sequence, e.g. 'b' (swap) partition is missing but 'e' partition is defined. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/inspect-fs-unix.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26

Mostly a line-for-line translation of the C inspection code. --- daemon/Makefile.am | 2 + daemon/inspect_fs.ml | 6 + daemon/inspect_fs_windows.ml | 491 ++++++++++++++++++++++++++++++++++++++++++ daemon/inspect_fs_windows.mli | 24 +++ 4 files changed, 523 insertions(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a4657ed86..80314a524 100644 ---

An installation of MS-DOS has various files in a /DOS directory, which COMMAND.COM looking like a reasonable signal that its MS-DOS or a very close relative there-of. This is validated with an MS-DOS 6.22 install. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- BTW, I'm unclear if we should make any attempt to try to detect and report Windows 3.x as a separate distro,

Fixes RHBZ#1113153. --- src/inspect-fs-unix.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 2abbf24..6dfc299 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -96,6 +96,9 @@ static char *resolve_fstab_device (guestfs_h *g, const char *spec,

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++-- src/inspect-fs.c | 12 ++++++ 3 files changed, 116 insertions(+), 3 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 33d28f5..c8dd084 100644 --- a/src/guestfs-internal.h +++

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 110 +++++++++++++++++++++++++++++++++++++++++++++---- src/inspect-fs.c | 12 ++++++ 3 files changed, 116 insertions(+), 7 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 33d28f5..c8dd084 100644 --- a/src/guestfs-internal.h +++