From 0c60e4d9dd6549c2135699490ba8a9ec1dd50ab9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jan 2011 10:43:51 +0000 Subject: 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 --- ruby/examples/inspect_vm.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ruby') 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. -- cgit