search for: re_primary_partition

..._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 || > + fs->type == OS_TYPE_NETBSD || > + fs->type == OS_TYPE_OPENBSD; > + > + if (fs->is_root && is_primary && is_bsd) { > + bsd_primary = fs; > + continue; > + }...

...inspect_fs *fs); diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 539d814..99a8658 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -47,7 +47,7 @@ * multiple threads call into the libguestfs API functions below * simultaneously. */ -static pcre *re_first_partition; +static pcre *re_primary_partition; static pcre *re_major_minor; static void compile_regexps (void) __attribute__((constructor)); @@ -68,14 +68,14 @@ compile_regexps (void) } \ } while (0) - COMPILE (re_first_partition, "^/dev/(?:h|s|v)d.1$",...

...> +{ > > + 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 || > > + fs->type == OS_TYPE_OPENBSD; > > + > > + if (fs->is_root && is_primary && is_bsd) { > > + bsd_primary = fs;...

...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 || >>> + fs->type == OS_TYPE_OPENBSD; >>> + >>> + if (fs->is_root && is_primary && is_bsd) { >>> +...

...fs_int_check_linux_usr (g, fs) == -1) + return -1; + } /* CoreOS /usr? */ else if (is_dir_bin && is_dir_share && diff --git a/src/inspect.c b/src/inspect.c index 9055226..5e904d2 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -46,6 +46,8 @@ COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) static void check_for_duplicated_bsd_root (guestfs_h *g); static void collect_coreos_inspection_info (guestfs_h *g); +static void collect_linux_inspection_info (guestfs_h *g); +static void collect_linux_inspection_info_for (guestfs_h *g, struct inspect_...

...+302,7 @@ SOURCES_ML = \ findfs.ml \ md.ml \ mount.ml \ + mount_utils.ml \ parted.ml \ listfs.ml \ realpath.ml \ diff --git a/daemon/inspect.ml b/daemon/inspect.ml index 6d4b17815..ce62c17f2 100644 --- a/daemon/inspect.ml +++ b/daemon/inspect.ml @@ -27,7 +27,7 @@ open Inspect_types let re_primary_partition = PCRE.compile "^/dev/(?:h|s|v)d.[1234]$" let rec inspect_os () = - Mount.umount_all (); + Mount_utils.umount_all (); (* Iterate over all detected filesystems. Inspect each one in turn. *) let fses = Listfs.list_filesystems () in diff --git a/daemon/inspect_fs.ml b/daemon/in...

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

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

...UX: case OS_DISTRO_BUILDROOT: + case OS_DISTRO_COREOS: case OS_DISTRO_FREEDOS: case OS_DISTRO_GENTOO: case OS_DISTRO_LINUX_MINT: diff --git a/src/inspect.c b/src/inspect.c index f528bf2..abe9087 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -42,6 +42,7 @@ COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) static void check_for_duplicated_bsd_root (guestfs_h *g); +static void collect_coreos_inspection_info (guestfs_h *g); /* The main inspection code. */ char ** @@ -70,6 +71,12 @@ guestfs_impl_inspect_os (guestfs_h *g) } } + /* The OS inspect...

...UX: case OS_DISTRO_BUILDROOT: + case OS_DISTRO_COREOS: case OS_DISTRO_FREEDOS: case OS_DISTRO_GENTOO: case OS_DISTRO_LINUX_MINT: diff --git a/src/inspect.c b/src/inspect.c index f528bf2..dd6a06f 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -42,6 +42,7 @@ COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) static void check_for_duplicated_bsd_root (guestfs_h *g); +static int collect_coreos_inspection_info (guestfs_h *g); /* The main inspection code. */ char ** @@ -70,6 +71,15 @@ guestfs_impl_inspect_os (guestfs_h *g) } } + /* The OS inspecti...

...de <sys/stat.h> -#include <errno.h> #include <libintl.h> #ifdef HAVE_ENDIAN_H @@ -38,7 +36,6 @@ #include "guestfs.h" #include "guestfs-internal.h" #include "guestfs-internal-actions.h" -#include "guestfs_protocol.h" COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) diff --git a/src/journal.c b/src/journal.c index b36b362..22b81de 100644 --- a/src/journal.c +++ b/src/journal.c @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> -#include <stdint.h> #include <inttypes.h> #include &lt...

...uld have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Printf + +open Std_utils + +open Utils +open Mountable +open Inspect_types + +let re_primary_partition = PCRE.compile "^/dev/(?:h|s|v)d.[1234]$" + +let rec inspect_os () = + Mount.umount_all (); + + (* Iterate over all detected filesystems. Inspect each one in turn. *) + let fses = Listfs.list_filesystems () in + + let fses = + filter_map ( + fun (mountable, vfs_type) -> +...

...uld have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Printf + +open Std_utils + +open Utils +open Mountable +open Inspect_types + +let re_primary_partition = Str.regexp "^/dev/(h\\|s\\|v)d.[1234]$" + +let rec inspect_os () = + Mount.umount_all (); + + (* Iterate over all detected filesystems. Inspect each one in turn. *) + let fses = Listfs.list_filesystems () in + + let fses = + filter_map ( + fun (mountable, vfs_type) -> +...

--- generator/c.ml | 2 -- 1 file changed, 2 deletions(-) diff --git a/generator/c.ml b/generator/c.ml index 055b683..963cf21 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1213,9 +1213,7 @@ and generate_client_actions hash () = #include <stdlib.h> #include <stdint.h> #include <inttypes.h> -#include <sys/types.h> #include <sys/stat.h> -#include

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.

Hi, as a followup for the signature fix for mount_vfs [1], here it is a patch series to generate automatically all the OCaml interfaces of daemon actions. [1] https://www.redhat.com/archives/libguestfs/2018-April/msg00059.html Thanks, Pino Toscano (5): daemon: directly use Optgroups daemon: use the structs from the Structs module daemon: move Lvm.lv_canonical to new Lvm_utils module

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

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

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.