X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=2012-fosdem%2F500.d%2Faudit.py;h=af1062e5650118b28b0257d567d2c9317393430e;hb=ba71c5150cb2b2dda38e1558f94496b4a98819b5;hp=4be22f7d41745f77794385f998aded0f20d2d60d;hpb=079ad0e5c62de65ec562484131732e3c06c08295;p=libguestfs-talks.git

diff --git a/2012-fosdem/500.d/audit.py b/2012-fosdem/500.d/audit.py
index 4be22f7..af1062e 100755
--- a/2012-fosdem/500.d/audit.py
+++ b/2012-fosdem/500.d/audit.py
@@ -4,22 +4,6 @@ import re
 import sys
 import guestfs
 
-def mount_disk (g, root):
-    mps = g.inspect_get_mountpoints (root)
-    def compare (a, b):
-        if len(a[0]) > len(b[0]):
-            return 1
-        elif len(a[0]) == len(b[0]):
-            return 0
-        else:
-            return -1
-    mps.sort (compare)
-    for mp_dev in mps:
-        try:
-            g.mount_ro (mp_dev[1], mp_dev[0])
-        except RuntimeError as msg:
-            print "%s (ignored)" % msg
-
 if len (sys.argv) != 2:
     raise (Error ("disk [image]"))
 disk = sys.argv[1]
@@ -34,7 +18,20 @@ if len (roots) == 0:
     raise (Error ("inspect_vm: no operating systems found"))
 
 for root in roots:
-    mount_disk (g, root)
+    mps = g.inspect_get_mountpoints (root)
+    def compare (a, b):
+        if len(a[0]) > len(b[0]):
+            return 1
+        elif len(a[0]) == len(b[0]):
+            return 0
+        else:
+            return -1
+    mps.sort (compare)
+    for mp_dev in mps:
+        try:
+            g.mount_ro (mp_dev[1], mp_dev[0])
+        except RuntimeError as msg:
+            print "%s (ignored)" % msg
 
     apps = g.inspect_list_applications (root)
     for app in apps: