search for: fses

...+), 2 deletions(-) diff --git a/cat/filesystems.c b/cat/filesystems.c index f1c2852..f679517 100644 --- a/cat/filesystems.c +++ b/cat/filesystems.c @@ -476,9 +476,27 @@ do_output_filesystems (void) } } if ((columns & COLUMN_SIZE)) { - size = guestfs_blockdev_getsize64 (g, fses[i]); - if (size == -1) + CLEANUP_FREE char *device = guestfs_mountable_device (g, fses[i]); + CLEANUP_FREE char *subvolume = NULL; + + guestfs_push_error_handler (g, NULL, NULL); + + subvolume = guestfs_mountable_subvolume (g, fses[i]); + if (subvolume == NULL &&am...

...+), 2 deletions(-) diff --git a/cat/filesystems.c b/cat/filesystems.c index f1c2852..cfdac86 100644 --- a/cat/filesystems.c +++ b/cat/filesystems.c @@ -476,9 +476,28 @@ do_output_filesystems (void) } } if ((columns & COLUMN_SIZE)) { - size = guestfs_blockdev_getsize64 (g, fses[i]); - if (size == -1) + CLEANUP_FREE char *device = guestfs_mountable_device (g, fses[i]); + CLEANUP_FREE char *subvolume = NULL; + + guestfs_push_error_handler (g, NULL, NULL); + + subvolume = guestfs_mountable_subvolume (g, fses[i]); + if (subvolume == NULL &&am...

...n(-) > > diff --git a/fish/options.c b/fish/options.c > index da5015d..5c09bfb 100644 > --- a/fish/options.c > +++ b/fish/options.c > @@ -280,7 +280,20 @@ display_mountpoints_on_failure (const char *mp_device, > guestfs_int_program_name); > > for (i = 0; fses[i] != NULL; i += 2) { > - CLEANUP_FREE char *p = guestfs_canonical_device_name (g, fses[i]); > + CLEANUP_FREE char *p = NULL; > + CLEANUP_FREE char *device = guestfs_mountable_device(g, fses[i]); > + CLEANUP_FREE char *volume = guestfs_mountable_subvolume(g, fses[i]); If gu...

...1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/fish/options.c b/fish/options.c index da5015d..9222b69 100644 --- a/fish/options.c +++ b/fish/options.c @@ -280,7 +280,33 @@ display_mountpoints_on_failure (const char *mp_device, guestfs_int_program_name); for (i = 0; fses[i] != NULL; i += 2) { - CLEANUP_FREE char *p = guestfs_canonical_device_name (g, fses[i]); + CLEANUP_FREE char *p = NULL; + CLEANUP_FREE char *device = guestfs_mountable_device(g, fses[i]); + CLEANUP_FREE char *subvolume = NULL; + int subvolume_errno; + + guestfs_push_error_handle...

...is invoked is given below. I need to mention that the code presented here lacks proper cleanup. /* guestfs_extend start */ /* get FS stats using libguestfs */ /* Filesystems. */ guestfs_h *g = NULL; int ret = 0; int j = 0; int cnt_drives = 0; char **fses = NULL; struct guestfs_statvfs *fs_stats = NULL; struct fs_info *fs = NULL; /* Work around collectd bug with waitpid() after fork() */ signal (SIGCHLD, SIG_DFL); g = guestfs_create(); if (g == NULL) { ERROR(PLUGIN_NAME " plugin: failed to create l...

...1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/fish/options.c b/fish/options.c index da5015d..5c09bfb 100644 --- a/fish/options.c +++ b/fish/options.c @@ -280,7 +280,20 @@ display_mountpoints_on_failure (const char *mp_device, guestfs_int_program_name); for (i = 0; fses[i] != NULL; i += 2) { - CLEANUP_FREE char *p = guestfs_canonical_device_name (g, fses[i]); + CLEANUP_FREE char *p = NULL; + CLEANUP_FREE char *device = guestfs_mountable_device(g, fses[i]); + CLEANUP_FREE char *volume = guestfs_mountable_subvolume(g, fses[i]); + + /* Reformat the int...

Hi all, Here is version 2 of the patch series, including the changes for Pino's remarks. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++

...-79,47 +79,47 @@ free_regexps (void) pcre_free (re_major_minor); } -static int check_filesystem (guestfs_h *g, const char *device, int is_block, int is_partnum); +static int check_filesystem (guestfs_h *g, const char *device, + int whole_device); static int extend_fses (guestfs_h *g); /* Find out if 'device' contains a filesystem. If it does, add * another entry in g->fses. */ int -guestfs___check_for_filesystem_on (guestfs_h *g, const char *device, - int is_block, int is_partnum) +guestfs___check_for_filesyst...

Hey there! Here are a few patches to fix unrelated things: one fixes the configure for older ncurses releases having no pkg-config files. The other two are fixing what Richard mentioned about guestfs subvolumes display Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case

...YTEM\MountedDevices\DosDevices blob to + * to libguestfs GPT partition device. For GPT disks, the blob is made of + * "DMIO:ID:" prefix followed by the GPT parition GUID. + */ +static char * +map_registry_disk_blob_gpt (guestfs_h *g, const void *blob) +{ + CLEANUP_FREE_STRING_LIST char **fses = NULL; + size_t i; + + fses = guestfs_list_filesystems (g); + if (fses == NULL) + return NULL; + + for (i = 0; fses[i] != NULL; i += 2) { + CLEANUP_FREE char *fs_guid = NULL; + CLEANUP_FREE char *blob_guid = NULL; + CLEANUP_FREE char *fs_dev = NULL; + + fs_dev = guestfs_canonic...

...erl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1435,6 +1435,56 @@ sub _check_for_applications $os->{apps} = \@apps; } +# Find the path which needs to be prepended to paths in grub.conf to make them +# absolute +sub _find_grub_prefix +{ + my ($g, $os) = @_; + + my $fses = $os->{filesystems}; + die("filesystems undefined") unless(defined($fses)); + + # Look for the filesystem which contains grub + my $grubdev; + foreach my $dev (keys(%$fses)) { + my $fsinfo = $fses->{$dev}; + if(exists($fsinfo->{content}) && $fsi...

...-git a/cat/filesystems.c b/cat/filesystems.c index cec3c4e47..2b95d3112 100644 --- a/cat/filesystems.c +++ b/cat/filesystems.c @@ -508,7 +508,23 @@ do_output_filesystems (void) guestfs_pop_error_handler (g); if (!device || !subvolume) { - size = guestfs_blockdev_getsize64 (g, fses[i]); + /* Try mounting and stating the device. This might reasonably + * fail, so don't show errors. + */ + guestfs_push_error_handler (g, NULL, NULL); + + if (guestfs_mount_ro (g, fses[i], "/") == 0) { + CLEANUP_FREE_STATVFS struct guest...

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

Allow to skip testing the filesystem "foo" if the environment variable SKIP_TEST_CHARSET_FIDELITY_foo=1 is set. This way it possible to not test one or more filesystems without disabling the test altogether. --- tests/charsets/test-charset-fidelity.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/charsets/test-charset-fidelity.c

...quot;convert called without desc argument") unless defined($desc); + croak("convert called without root argument") unless defined($root); croak("convert called without meta argument") unless defined($meta); my $guestcaps; + # Mount up the disks. + my %fses = $g->inspect_get_mountpoints ($root); + my @fses = sort { length $a <=> length $b } keys %fses; + foreach (@fses) { + eval { $g->mount_options ("", $fses{$_}, $_) }; + print __x("{e} (ignored)\n", e => $@) if $@; + } + + # Construct the...

...ect-fs.c @@ -47,7 +47,7 @@ COMPILE_REGEXP (re_major_minor, "(\\d+)\\.(\\d+)", 0) static int check_filesystem (guestfs_h *g, const char *mountable, const struct guestfs_internal_mountable *m, int whole_device); -static int extend_fses (guestfs_h *g); +static void extend_fses (guestfs_h *g); static int get_partition_context (guestfs_h *g, const char *partition, int *partnum_ret, int *nr_partitions_ret); /* Find out if 'device' contains a filesystem. If it does, add @@ -75,8 +75,7 @@ guestfs_int_check_for_filesystem_o...

Hi there, Latest and greatest version including all new remarks from both Pino and Rich. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++ m4/guestfs_libraries.m4

...) + +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) -> + Inspect_fs.check_for_filesystem_on mountable vfs_type + ) fses in + if verbose () then ( + eprintf "inspect_os: fses:\n"; + List.iter (fun fs -> eprintf "%s&qu...

...) + +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) -> + Inspect_fs.check_for_filesystem_on mountable vfs_type + ) fses in + if verbose () then ( + eprintf "inspect_os: fses:\n"; + List.iter (fun fs -> eprintf "%s&qu...

...to > + * to libguestfs GPT partition device. For GPT disks, the blob is made of > + * "DMIO:ID:" prefix followed by the GPT parition GUID. > + */ > +static char * > +map_registry_disk_blob_gpt (guestfs_h *g, const void *blob) > +{ > + CLEANUP_FREE_STRING_LIST char **fses = NULL; > + size_t i; > + > + fses = guestfs_list_filesystems (g); > + if (fses == NULL) > + return NULL; Did you really mean to call guestfs_list_filesystems here? If you're trying to get the list of partitions, then guestfs_list_partitions is what you should be calling....