diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-15 14:27:07 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-15 14:27:07 +0000 |
| commit | eaf463e4cc15820a5a8b91a31266fee02438c2c9 (patch) | |
| tree | 0e21f270f297dd1659ce88012d893c42e131d426 /plugins | |
| parent | 2bda552391f5503d3b08a41972e675305a695be8 (diff) | |
removed temporary comment lines
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenapi/etc/xapi.d/plugins/objectstore | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore index af653c495..c78f0b1d8 100644 --- a/plugins/xenapi/etc/xapi.d/plugins/objectstore +++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore @@ -46,10 +46,8 @@ MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE def is_vdi_pv(session,args): logging.debug("Checking wheter VDI has PV kernel") vdi = exists(args, 'vdi-ref') - pv=False pv=with_vdi_in_dom0(session, vdi, False, lambda dev: _is_vdi_pv('/dev/%s' % dev)) - logging.debug("HERE - bye bye") if (pv): return 'true' else: @@ -58,20 +56,15 @@ def is_vdi_pv(session,args): def _is_vdi_pv(dest): logging.debug("Running pygrub against %s",dest) output=os.popen('pygrub -qn %s' % dest) - logging.debug("HERE - 1") pv=False - logging.debug("HERE - 2") for line in output.readlines(): #logging.debug("line:",line) - logging.debug("HERE - loop") #try to find kernel string m=re.search('(?<=kernel:)/.*(?:>)',line) if (m<>None): if m.group(0).find('xen')<>-1: pv=True - logging.debug("HERE - 3") logging.debug("PV:%d",pv) - logging.debug("HERE - 4") return pv def get_vdi(session, args): |