similar to: [PATCH 3/5] Support fstab block device resolution for NetBSD

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

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

The device name prefix for IDE hard drives used to be `ad' but now is `ada' (http://www.freebsd.org/doc/handbook/disks-naming.html). For virtio hard drives it is `vtbd'. Under an mbr partition table a slice will be used, so the name of the first partitions will be either ada0s1a or vtbd0s1a. Under a GPT partition table, where no slice is needed, the name of the first partition will be

The device name prefix for IDE hard drives used to be `ad' but now is `ada' (http://www.freebsd.org/doc/handbook/disks-naming.html). For virtio hard drives it is `vtbd'. Under an MBR partition table a slice will be used, so the name of the first partitions will be either `ada0s1a' or `vtbd0s1a'. Under a GPT partition table, where no slice is needed, the name of the first

On Sun, Nov 03, 2013 at 11:16:23PM +0200, Nikos Skalkotos wrote: > + char type_c = (strcmp (type, "vtbd") == 0) ? 'v' : 's'; > int disk_i = guestfs___parse_unsigned_int (g, disk); > int slice_i = guestfs___parse_unsigned_int (g, slice); > int part_i = part[0] - 'a' /* counting from 0 */; > @@ -1481,7 +1501,7 @@ resolve_fstab_device

Take into granted that partition 'c' has a special purpose. It has always the same size as the enclosing slice and is not mapped under Linux. This is a best effort try. The mapping will be incorrect if there is a gap in the disklabel partitions sequence, e.g. 'b' (swap) partition is missing but 'd' partition is defined. Signed-off-by: Nikos Skalkotos

Take into granted that partition 'c' has a special purpose. It has always the same size as the enclosing slice and is not mapped under Linux. This is a best effort try. The mapping will be incorrect if there is a gap in the disklabel partitions sequence, e.g. 'b' (swap) partition is missing but 'd' partition is defined. Signed-off-by: Nikos Skalkotos

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

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,

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

On Tuesday, 6 December 2016 09:46:25 CET Richard W.M. Jones wrote: > For example, converts "///usr//local//" -> "/usr/local". > --- > src/inspect-fs-unix.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c > index a1a757c..0fea9c8 100644 > ---

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

For example, converts "///usr//local//" -> "/usr/local". --- src/inspect-fs-unix.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index a1a757c..0fea9c8 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -89,6 +89,7 @@ static char *resolve_fstab_device

Just basic identification, name and version. --- 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 --git a/generator/actions.ml b/generator/actions.ml index 13c8bc8..2f0ad0b 100644 ---

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

When parsing "xdev"-kind devices, do not assume that the partition number can be converted to integer: re_xdev accepts an empty part of the partition number, so just handle as it is, as string. This fixes a regression due to the conversion of the inspection code to OCaml, as the old C version did not have this issue. --- daemon/inspect_fs_unix_fstab.ml | 6 +++--- 1 file changed, 3

Regular EFI disks have /EFI on the first (VFAT) partition, but they are not installers. Fix this by only considering something to be an installer if it has a single partition (or whole disks like ISOs). Implementing this is quite complex since when checking a filesystem, we don't have information about whether we are even looking at a partition, nor about whether it's the first partition

Select non-comment labels using an augeas path to return the correct nodes in the first instance, rather than applying a regular expression to all results. Iterate over returned matches using a char** iterator. Use asprintf() to ensure the path string buffer is the correct size. --- src/inspect_fs_unix.c | 50 +++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+),