similar to: [PATCH 0/3] 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 | 62

* 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

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- .gitignore | 1 + inspector/Makefile.am | 1 + inspector/expected-coreos.img.xml | 30 +++++++++++ tests/guests/Makefile.am | 6 +++ tests/guests/guest-aux/make-coreos-img.sh | 83 +++++++++++++++++++++++++++++++ tests/guests/guests.xml.in | 16

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- .gitignore | 1 + inspector/Makefile.am | 1 + inspector/expected-coreos.img.xml | 30 +++++++++++ inspector/test-virt-inspector.sh | 2 +- tests/guests/Makefile.am | 6 +++ tests/guests/guest-aux/make-coreos-img.sh | 83

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

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs.c | 115

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs.c | 102

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,

In inspect-fs-unix.c:1197 in add_fstab_entry() then too. On 02/06/15 18:39, Richard W.M. Jones wrote: > On Tue, Jun 02, 2015 at 06:37:06PM +0300, Nikos Skalkotos wrote: >> 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)) { >>

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

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 Tue, Jun 02, 2015 at 06:37:06PM +0300, Nikos Skalkotos wrote: > 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; > } > } Oh I see, yes that's a bug too. > I don't see the bug. I

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

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

On Tue, Jun 02, 2015 at 06:18:38PM +0300, Nikos Skalkotos wrote: > 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

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

Extend the guestfs_inspect_list_applications2 API call to work on Arch Linux guest images. Signed-off-by: Nikos Skalkotos <skalkoto@gmail.com> --- src/inspect-apps.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/src/inspect-apps.c b/src/inspect-apps.c index 6fb9665..8e645b7 100644 --- a/src/inspect-apps.c +++

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