similar to: [PATCH 4/5] Fix fstab block device resolution for FreeBSD

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

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

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

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

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

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

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

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

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

Hello Richard, I think my patch is sufficient. I don't thing you need this patch at all. The regular expression /dev/(ada{0,1}|vtbd) will match both: /dev/ada and /dev/ad. This is why I use "{0,1}" (=zero or one occurrence of the character a) Nikos On Tue 05 Nov 2013 01:42:44 PM EET, Richard W.M. Jones wrote: > On Tue, Nov 05, 2013 at 12:15:47PM +0200, Nikos Skalkotos wrote:

On Tue, Nov 05, 2013 at 12:15:47PM +0200, Nikos Skalkotos wrote: > 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

Use commandrvf() instead of commandvf() to execute e2fsck. A non-zero exit status does not always indicate a failure. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- daemon/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 65ddae6..8ef6d5f 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -296,9 +296,9 @@ do_e2fsck

In no particular order. Some of these need further investigation. ---------------------------------------------------------------------- I had to patch libguestfs not to use febootstrap-supermin-helper --copy-kernel option. See attachment #1. This could be avoided by providing a newer febootstrap in Wheezy. I had to patch libguestfs to make it not use the (not working) virtio-scsi in old

On Tue, Dec 02, 2014 at 07:11:55PM +0200, Nikos Skalkotos wrote: > Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> > --- > src/inspect-fs-unix.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c > index 01a59f1..f55e53b 100644 > --- a/src/inspect-fs-unix.c > +++ b/src/inspect-fs-unix.c

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/inspect-fs-unix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 01a59f1..f55e53b 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -58,8 +58,8 @@ COMPILE_REGEXP (re_scientific_linux, "Scientific Linux.*release

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

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

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

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