similar to: [PATCH 2/3] inspection: Add support for CoreOS

* Implement coreos distro * Detect CoreOS images Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- generator/actions.ml | 4 +++ src/guestfs-internal.h | 3 +++ src/inspect-fs-unix.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- src/inspect-fs.c | 21 +++++++++++++++ src/inspect-icon.c | 1 + src/inspect.c | 59

Look for /lib/os-release in the /usr partition and try to use it, if present, before using lsb-release later on. This should not change the final result of the inspection, while using the os-release detection method also for CoreOS. --- Nikos, since you added the support for CoreOS in libguestfs, can you please check whether this change works for you as well? Thanks in advance.

On Wed, Mar 30, 2016 at 04:38:31PM +0200, Pino Toscano wrote: > Look for /lib/os-release in the /usr partition and try to use it, if > present, before using lsb-release later on. This should not change the > final result of the inspection, while using the os-release detection > method also for CoreOS. > --- > Nikos, since you added the support for CoreOS in libguestfs, can you

Hello, It looks good to me and it makes the code more robust. Removing /usr/lib/os-release in future releases of CoreOS is less probable than removing /usr/share/coreos/lsb-release. After such a change I would also update `test-data/phony-guests/make-coreos-img.sh' to also inject an os-release file in the dummy image it creates. Find attached the `/usr/lib/os-release' and

Flag the filesystems for Linux /usr properly as USR role, and detect some data out of it, like the distro information from an os-release (if present), and the architecture (since the binaries used for our architecture check will be available there only). Later on, collect the results in a way similar to what is done for CoreOS: for each non-CoreOS root, try to find its /usr filesystem, and if

Prior to this commit the distro for a FreeBSD or a NetBSD system, in conjuction to what happened for OpenBSD, was shown as 'unknown'. *BSDs are complete OSes, not a kernel like Linux, but theoritically you could have FreeBSD as ostype and PC-BSD as distro. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- generator/actions.ml | 8 ++++++++ src/guestfs-internal.h | 2 ++

Prior to this commit the distro for a FreeBSD or a NetBSD system, in conjuction to what happened for OpenBSD, was shown as 'unknown'. *BSDs are complete OSes, not a kernel like Linux, but theoritically you could have FreeBSD as ostype and PC-BSD as distro. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- generator/actions.ml | 8 ++++++++ src/guestfs-internal.h | 2 ++

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. The series includes also a new private debug API, and its usage to fix the resolution of /dev/mapper/.. devices found in fstab; without it, LVM /usr filesystems are not recognized as belonging to their

On 02/06/15 17:10, Richard W.M. Jones wrote: Hello, > On Fri, May 29, 2015 at 12:24:58PM +0300, Nikos Skalkotos wrote: >> + if (collect_coreos_inspection_info (g)) { >> + guestfs_int_free_inspect_info (g); >> + return NULL; >> + } > Although this is stylistic, I think it's easier to understand if > you change the if condition to: > > if

--- src/inspect-fs-unix.c | 22 +++++++--------------- src/inspect-fs.c | 21 ++++++--------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 8ffd85d..c9bbad9 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -90,8 +90,8 @@ static int check_hostname_unix (guestfs_h *g, struct inspect_fs *fs); static

Just basic identification, name and version. --- generator/actions.ml | 4 ++++ src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 10 ++++++++++ src/inspect-fs.c | 2 ++ src/inspect-icon.c | 1 + src/inspect.c | 1 + 6 files changed, 19 insertions(+) diff --git a/generator/actions.ml b/generator/actions.ml index 35af981..26cc0da 100644 --- a/generator/actions.ml

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

Check its presence ahead of /etc/redhat-release, as the distro provides it and thus previously it was recognized as "redhat-based". --- generator/actions.ml | 4 ++++ src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 21 +++++++++++++++++++++ src/inspect-fs.c | 2 ++ src/inspect-icon.c | 1 + src/inspect.c | 1 + 6 files changed, 30 insertions(+) diff

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

Update SuSE Linux detection. Up to now everything with a /etc/SuSE-release file was treated as openSuSE. With this change SLES based distributions such as "SUSE Linux Enterprise Server", "SUSE Linux Enterprise Desktop" and "Novell Linux Desktop" will show up as "sles". The 'opensuse' detection was updated to handle older openSuSE releases as well as

Sorry, I don't get it. In inspect.c line 67 you have this: for (fs = fses; *fs; fs += 2) { if (guestfs_int_check_for_filesystem_on (g, *fs)) { guestfs_int_free_inspect_info (g); return NULL; } } I don't see the bug. On 02/06/15 18:30, Richard W.M. Jones wrote: > On Tue, Jun 02, 2015 at 06:18:38PM +0300, Nikos Skalkotos wrote: >> On 02/06/15 17:10,

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. Changes in v2: - removed patches #1 and #2, already pushed - drop patch #3, no more needed - replace patch #4 with a better suggestion from Rich - change if into assert in patch #5 Thanks, Pino Toscano

Associate the Alpine Linux distribution with it. --- generator/actions.ml | 4 ++-- src/guestfs-internal.h | 2 ++ src/inspect-apps.c | 1 + src/inspect-fs.c | 10 ++++++++-- src/inspect.c | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/generator/actions.ml b/generator/actions.ml index 26cc0da..d0d6a21 100644 --- a/generator/actions.ml +++

Since Void Linux provides only an /etc/os-release with no VERSION_ID field, then special-case it to avoid that the os-release parsing ignore it. This provides basic distro identification, and icon. --- generator/actions.ml | 4 ++++ inspector/virt-inspector.rng | 1 + src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 14 ++++++++++++-- src/inspect-fs.c |

This patch set adds support for inspecting CoreOS installations. In CoreOS the files that need to be inspected under /etc are links to files under /usr which is hosted on a different partition and mounted read only. Hence, inspecting the root fs is not enough to gather all needed information. This patch set adds code for recognizing the root and the /usr partitions of CoreOS and a new internal