diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-01-11 10:43:51 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-01-11 11:09:41 +0000 |
| commit | 0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9 (patch) | |
| tree | 25e5e1f71bb285fd4964bf2c6c1489656e74a241 /examples/inspect_vm.c | |
| parent | fc241abdbac7a016cd2fac169ad64876107df3c8 (diff) | |
| download | libguestfs-0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9.tar.gz libguestfs-0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9.tar.xz libguestfs-0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9.zip | |
fish: Don't fail if some mountpoints in /etc/fstab are bogus (RHBZ#668574).
Fix guestfish (and other C tools) so that they ignore errors
when /etc/fstab contains bogus entries.
Update the documentation for inspect-get-mountpoints to emphasize
that callers must be aware of this when mounting the returned
values.
Add a regression test.
Update the example code ("inspect_vm") to reflect the way this
API ought to be called.
For more detail see:
https://bugzilla.redhat.com/show_bug.cgi?id=668574
Diffstat (limited to 'examples/inspect_vm.c')
| -rw-r--r-- | examples/inspect_vm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/inspect_vm.c b/examples/inspect_vm.c index 4019a011..327a5662 100644 --- a/examples/inspect_vm.c +++ b/examples/inspect_vm.c @@ -98,8 +98,10 @@ main (int argc, char *argv[]) qsort (mountpoints, count_strings (mountpoints) / 2, 2 * sizeof (char *), compare_keys_len); for (i = 0; mountpoints[i] != NULL; i += 2) { - if (guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]) == -1) - exit (EXIT_FAILURE); + /* Ignore failures from this call, since bogus entries can + * appear in the guest's /etc/fstab. + */ + guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]); free (mountpoints[i]); free (mountpoints[i+1]); } |