summaryrefslogtreecommitdiffstats
path: root/python
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 /python
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 'python')
-rw-r--r--python/examples/inspect_vm.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/examples/inspect_vm.py b/python/examples/inspect_vm.py
index 0ba6e3e9..c491a2ce 100644
--- a/python/examples/inspect_vm.py
+++ b/python/examples/inspect_vm.py
@@ -44,7 +44,10 @@ for root in roots:
return -1
mps.sort (compare)
for mp_dev in mps:
- g.mount_ro (mp_dev[1], mp_dev[0])
+ try:
+ g.mount_ro (mp_dev[1], mp_dev[0])
+ except RuntimeError as msg:
+ print "%s (ignored)" % msg
# If /etc/issue.net file exists, print up to 3 lines.
filename = "/etc/issue.net"