search for: display_mountpoints_on_failur

...is_btrfs_subvolume g fs = let device = g#mountable_device fs in try ignore (g#mountable_subvolume fs); true with Guestfs.Error msg as exn -> if g#last_errno () = Guestfs.Errno.errno_EINVAL then false else raise exn Apart from that, this is just a translation of fish/options.c: display_mountpoints_on_failure into OCaml, so ACK if that was fixed. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html

...btrfs subvolumes. Let's printing a valid -m option value instead. --- fish/options.c | 15 ++++++++++++++- 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_F...

...umes. Let's printing a valid -m option value instead. --- fish/options.c | 28 +++++++++++++++++++++++++++- 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_F...

...ting too, but you were faster :) I think this will fail to build as "device" is unused, so the first line should be: (* Make sure we can determine the device of the mountable. *) ignore (g#mountable_device fs); > Apart from that, this is just a translation of fish/options.c: > display_mountpoints_on_failure into OCaml, so ACK if that was fixed. Indeed, LGTM with the above fix. Thanks, -- Pino Toscano

...-m option value instead. > --- > fish/options.c | 15 ++++++++++++++- > 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_devi...

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

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

This patcheset fixes errors in virt-sysprep and virt-sparsify. Here we have a common functionality: is_btrfs_subvolume. Doesn't it make sense to turn it into guestfs API? Also I found an issue. In 'virt-sysprep fs-uuids', the uuids for ALL filesystems are regenerated as many times as many roots are in guest. Is it done intentionally? Maxim Perevedentsev (3): mllib: add checking

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

...FAILURE); drv->nr_drives = 1; - next_drive++; + drive_index++; break; default: /* keep GCC happy */ @@ -226,7 +216,7 @@ add_drives_handle (guestfs_h *g, struct drv *drv, char next_drive) } } - return next_drive; + return drive_index; } static void display_mountpoints_on_failure (const char *mp_device, const char *user_supplied_options); @@ -320,8 +310,6 @@ free_drives (struct drv *drv) if (!drv) return; free_drives (drv->next); - free (drv->device); - switch (drv->type) { case drv_a: free (drv->a.filename); diff --git a/common/options/opti...

Hi, this series update libguestfs to a recent gnulib version, so that we can use its new getprogname module, and solve altogether one of the porting issues (the need for 'program_name' by the error module of gnulib), and have a single way to get the name of the current program. A number of changes in tools mostly, although mechanical. Thanks, Pino Toscano (3): Update gnulib to latest

...t_drive) == -1) { - perror ("asprintf"); - exit (EXIT_FAILURE); - } + if (asprintf (&drv->device, "/dev/sd%c", next_drive) == -1) + error (EXIT_FAILURE, errno, "asprintf"); switch (drv->type) { case drv_a: @@ -299,10 +292,8 @@ display_mountpoints_on_failure (const char *mp_device, /* Reformat the internal btrfsvol string into a valid mount option */ if (device && subvolume) { - if (asprintf (&p, "%s:/:subvol=%s", device, subvolume) == -1) { - perror ("asprintf"); - exit (EXIT_FAILURE); -...

...equivalent commands\n" "(see the virt tool manual page).\n"), getprogname ()); diff --git a/common/options/options.c b/common/options/options.c index a531e2e18..c9948d72f 100644 --- a/common/options/options.c +++ b/common/options/options.c @@ -275,11 +275,11 @@ display_mountpoints_on_failure (const char *mp_device, if (fses == NULL || fses[0] == NULL) return; - fprintf (stderr, _("%s: '%s' could not be mounted.\n"), + fprintf (stderr, _("%s: ‘%s’ could not be mounted.\n"), getprogname (), mp_device); if (user_supplied_options) -...

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.