search for: is_bsd

...mes /dev/sda[1234] is a shadow of the real root > + * filesystem that is probably /dev/sda5 > + * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) > + */ > +static void > +check_for_duplicated_bsd_root (guestfs_h *g) > +{ > + size_t i; > + bool is_primary, is_bsd; > + struct inspect_fs *fs, *bsd_primary = NULL; > + > + for (i = 0; i < g->nr_fses; ++i) { > + fs = &g->fses[i]; > + > + is_primary = match (g, fs->mountable, re_primary_partition); > + is_bsd = > + fs->type == OS_TYPE_FREEBSD || > +...

...s_h *g); +/* On *BSD systems, sometimes /dev/sda[1234] is a shadow of the real root + * filesystem that is probably /dev/sda5 + * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) + */ +void +guestfs___check_for_dublicated_bsd_root(guestfs_h *g) +{ + size_t i; + bool is_primary, is_bsd; + struct inspect_fs *fs, *bsd_primary = NULL; + + for (i = 0; i < g->nr_fses; ++i) { + fs = &g->fses[i]; + + is_primary = match (g, fs->mountable, re_primary_partition); + is_bsd = ((fs->type == OS_TYPE_FREEBSD) || \ + (fs->type == OS_TYPE_NETBSD) || \...

...al root > > + * filesystem that is probably /dev/sda5 > > + * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) > > + */ > > +static void > > +check_for_duplicated_bsd_root (guestfs_h *g) > > +{ > > + size_t i; > > + bool is_primary, is_bsd; > > + struct inspect_fs *fs, *bsd_primary = NULL; > > + > > + for (i = 0; i < g->nr_fses; ++i) { > > + fs = &g->fses[i]; > > + > > + is_primary = match (g, fs->mountable, re_primary_partition); > > + is_bsd = > > + fs-...

...filesystem that is probably /dev/sda5 >>> + * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) >>> + */ >>> +static void >>> +check_for_duplicated_bsd_root (guestfs_h *g) >>> +{ >>> + size_t i; >>> + bool is_primary, is_bsd; >>> + struct inspect_fs *fs, *bsd_primary = NULL; >>> + >>> + for (i = 0; i < g->nr_fses; ++i) { >>> + fs = &g->fses[i]; >>> + >>> + is_primary = match (g, fs->mountable, re_primary_partition); >>> + is_bsd =...

...(+), 1 deletion(-) diff --git a/inspector/inspector.c b/inspector/inspector.c index 3583c61df..30d279987 100644 --- a/inspector/inspector.c +++ b/inspector/inspector.c @@ -347,6 +347,7 @@ output_root (xmlTextWriterPtr xo, char *root) char buf[32]; char *canonical_root; size_t size; + int is_bsd; XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "operatingsystem")); @@ -362,6 +363,10 @@ output_root (xmlTextWriterPtr xo, char *root) if (STRNEQ (str, "unknown")) XMLERROR (-1, xmlTextWriterWriteElement (xo, BAD_CAST "name", BAD_CAST str...

...gt; > index 3583c61df..30d279987 100644 > > --- a/inspector/inspector.c > > +++ b/inspector/inspector.c > > @@ -347,6 +347,7 @@ output_root (xmlTextWriterPtr xo, char *root) > > char buf[32]; > > char *canonical_root; > > size_t size; > > + int is_bsd; > > > > XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "operatingsystem")); > > > > @@ -362,6 +363,10 @@ output_root (xmlTextWriterPtr xo, char *root) > > if (STRNEQ (str, "unknown")) > > XMLERROR (-1, > >...

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.

...or/inspector.c b/inspector/inspector.c > index 3583c61df..30d279987 100644 > --- a/inspector/inspector.c > +++ b/inspector/inspector.c > @@ -347,6 +347,7 @@ output_root (xmlTextWriterPtr xo, char *root) > char buf[32]; > char *canonical_root; > size_t size; > + int is_bsd; > > XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "operatingsystem")); > > @@ -362,6 +363,10 @@ output_root (xmlTextWriterPtr xo, char *root) > if (STRNEQ (str, "unknown")) > XMLERROR (-1, > xmlTextWriterWriteElement (xo, BAD_...

...100644 > > > --- a/inspector/inspector.c > > > +++ b/inspector/inspector.c > > > @@ -347,6 +347,7 @@ output_root (xmlTextWriterPtr xo, char *root) > > > char buf[32]; > > > char *canonical_root; > > > size_t size; > > > + int is_bsd; > > > > > > XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "operatingsystem")); > > > > > > @@ -362,6 +363,10 @@ output_root (xmlTextWriterPtr xo, char *root) > > > if (STRNEQ (str, "unknown")) > > > XM...

...ck_hostname_freebsd (guestfs_h *g, struct inspect_fs *fs) } static int +check_systemd_mnt (guestfs_h *g, struct inspect_fs *fs, const char *fname) +{ + CLEANUP_FREE_STRING_LIST char **entries = NULL; + char **entry; + char augpath[256]; + CLEANUP_HASH_FREE Hash_table *md_map = NULL; + bool is_bsd = (fs->type == OS_TYPE_FREEBSD || + fs->type == OS_TYPE_NETBSD || + fs->type == OS_TYPE_OPENBSD); + + /* Generate a map of MD device paths listed in /etc/mdadm.conf to MD device + * paths in the guestfs appliance */ + if (map_md_devices (g, &md_map)...

Adds support for systemd .mount files, uses Augeas to extract mount points. Fixes RHBZ#1113153. Maros Zatko (1): inspection: add support for systemd .mount files src/inspect-fs-unix.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) -- 1.9.3

..., see check_windows_system_registry */ case OS_TYPE_DOS: - case OS_TYPE_OPENBSD: case OS_TYPE_UNKNOWN: /* nothing */; } @@ -921,6 +984,9 @@ check_fstab (guestfs_h *g, struct inspect_fs *fs) char **entry; char augpath[256]; CLEANUP_HASH_FREE Hash_table *md_map = NULL; + bool is_bsd = (fs->type == OS_TYPE_FREEBSD || + fs->type == OS_TYPE_NETBSD || + fs->type == OS_TYPE_OPENBSD); /* Generate a map of MD device paths listed in /etc/mdadm.conf to MD device * paths in the guestfs appliance */ @@ -975,12 +1041,31 @@ check_fstab (gue...

...It is true that we don't add new identifications often, but since it's already implemented here... > +and check_fstab_entry md_map root_mountable os_type aug entry = > + if verbose () then > + eprintf "check_fstab_entry: augeas path: %s\n%!" entry; > + > + let is_bsd = > + os_type = OS_TYPE_FREEBSD || > + os_type = OS_TYPE_NETBSD || > + os_type = OS_TYPE_OPENBSD in 'match' here? -- Pino Toscano

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

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

...; in + let entries = aug_matches_noerrors aug path in + filter_map (check_fstab_entry md_map root_mountable os_type aug) entries + +and check_fstab_entry md_map root_mountable os_type aug entry = + if verbose () then + eprintf "check_fstab_entry: augeas path: %s\n%!" entry; + + let is_bsd = + match os_type with + | OS_TYPE_FREEBSD | OS_TYPE_NETBSD | OS_TYPE_OPENBSD -> true + | OS_TYPE_DOS | OS_TYPE_HURD | OS_TYPE_LINUX | OS_TYPE_MINIX + | OS_TYPE_WINDOWS -> false in + + let spec = aug_get_noerrors aug (entry ^ "/spec") in + let mp = aug_get_noerrors aug...

...; in + let entries = aug_matches_noerrors aug path in + filter_map (check_fstab_entry md_map root_mountable os_type aug) entries + +and check_fstab_entry md_map root_mountable os_type aug entry = + if verbose () then + eprintf "check_fstab_entry: augeas path: %s\n%!" entry; + + let is_bsd = + os_type = OS_TYPE_FREEBSD || + os_type = OS_TYPE_NETBSD || + os_type = OS_TYPE_OPENBSD in + + let spec = aug_get_noerrors aug (entry ^ "/spec") in + let mp = aug_get_noerrors aug (entry ^ "/file") in + let vfstype = aug_get_noerrors aug (entry ^ "/vfstype&qu...

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.

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