Prevent the janitor from trying to clean up nonexistent LVs.

[invirt/packages/invirt-remote.git] / host / usr / sbin / invirt-listvms

diff --git a/host/usr/sbin/invirt-listvms b/host/usr/sbin/invirt-listvms
index c16a883..9c22f59 100755 (executable)
--- a/host/usr/sbin/invirt-listvms
+++ b/host/usr/sbin/invirt-listvms
@@ -32,7 +32,19 @@ def get_dom(domid):
     data['vm'] = xsc.read('', '/local/domain/%d/vm' % domid)
     data['start_time'] = float(xsc.read('', '%s/start_time' % data['vm']))
     data['uptime'] = time.time()-data['start_time']
-    
+    # CD or autoinstall, if we're using either
+    vbds = xsc.ls('', '/local/domain/%d/device/vbd' % domid)
+    for vbd in vbds:
+        dev = '/local/domain/%d/device/vbd/%s' % (domid, vbd)
+        dev_type = xsc.read('', '%s/device-type' % dev)
+        dev_params = xsc.read('', '%s/params' % xsc.read('', '%s/backend' % dev))
+        if dev_type == 'cdrom':
+            data['cdrom'] = dev_params
+        elif dev_type == 'disk' and dev_params == '/dev/xenvg/s_install_hda':
+            data['autoinstall'] = True
+    if 'auto=true' in xsc.read('', '%s/image/cmdline' % data['vm']):
+        data['autoinstall'] = True
+
     return name, data
 
 if __name__ == '__main__':