summaryrefslogtreecommitdiffstats
path: root/ruby
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-01-11 10:43:51 +0000
committerRichard W.M. Jones <rjones@redhat.com>2011-01-11 11:09:41 +0000
commit0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9 (patch)
tree25e5e1f71bb285fd4964bf2c6c1489656e74a241 /ruby
parentfc241abdbac7a016cd2fac169ad64876107df3c8 (diff)
downloadlibguestfs-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 'ruby')
-rw-r--r--ruby/examples/inspect_vm.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/ruby/examples/inspect_vm.rb b/ruby/examples/inspect_vm.rb
index 032dec4f..abf22790 100644
--- a/ruby/examples/inspect_vm.rb
+++ b/ruby/examples/inspect_vm.rb
@@ -41,7 +41,11 @@ for root in roots do
mps = g.inspect_get_mountpoints(root)
mps = mps.sort {|a,b| a[0].length <=> b[0].length}
for mp in mps do
- g.mount_ro(mp[1], mp[0])
+ begin
+ g.mount_ro(mp[1], mp[0])
+ rescue Guestfs::Error => msg
+ printf("%s (ignored)\n", msg)
+ end
end
# If /etc/issue.net file exists, print up to 3 lines.