spacepaste

Paste details

reply | raw | toggle line wrapping

  1.  
  2. diff --git a/ironic_lib/disk_utils.py b/ironic_lib/disk_utils.py
  3. index 3655891..f2d165d 100644
  4. --- a/ironic_lib/disk_utils.py
  5. +++ b/ironic_lib/disk_utils.py
  6. @@ -325,10 +325,15 @@ def populate_image(src, dst):
  9. def block_uuid(dev):
  10. - """Get UUID of a block device."""
  11. + """Get UUID of a block device.
  12. +
  13. + Try to fetch the UUID, if that fails, try to fetch the PARTUUID.
  14. + """
  15. out, _err = utils.execute('blkid', '-s', 'UUID', '-o', 'value', dev,
  16. - run_as_root=True,
  17. - check_exit_code=[0])
  18. + run_as_root=True, check_exit_code=[0])
  19. + if out is '':
  20. + out, _err = utils.execute('blkid', '-s', 'PARTUUID', '-o', 'value',
  21. + dev, run_as_root=True, check_exit_code=[0])
  22. return out.strip()
  25.  
Powered by spacepaste. Paste removal.