Merge remote branch 'cros/upstream' into master

client/bin/partition.py

 """
 APIs to write tests and control files that handle partition creation, deletion
 and formatting.
 
 @copyright: Google 2006-2008
 @author: Martin Bligh (mbligh@google.com)
 """
 
 import os, re, string, sys, fcntl, logging
 from autotest_lib.client.bin import os_dep, utils
@@ skipping 167 matching lines @@
 
 def get_mount_info(partition_list):
     """
     Picks up mount point information about the machine mounts. By default, we
     try to associate mount points with UUIDs, because in newer distros the
     partitions are uniquely identified using them.
     """
     mount_info = set()
     for p in partition_list:
         try:
-            uuid = utils.system_output('blkid -s UUID -o value %s' % p.device)
+            uuid = utils.system_output('blkid -p -s UUID -o value %s' % p.device)
         except error.CmdError:
             # fall back to using the partition
             uuid = p.device
         mount_info.add((uuid, p.get_mountpoint()))
 
     return mount_info
 
 
 def filter_partition_list(partitions, devnames):
     """
@@ skipping 792 matching lines @@
             os.remove(self.img)
         except:
             e_msg = 'Error removing image file %s' % self.img
             raise error.AutotestError(e_msg)
 
 # import a site partition module to allow it to override functions
 try:
     from autotest_lib.client.bin.site_partition import *
 except ImportError:
     pass