commit eddf9bd63c1f7e0f9709f7c58a1035fa43338325
author Jeff Sharkey <jsharkey@android.com> Wed Aug 12 16:04:35 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Aug 12 16:04:52 2015 -0700
tree 48f2cd2ea24e7c023de98ad96184a569f9adb3b6
parent 1bd078fa7b5ca613cb3e793d67ccd86d2602787d

Request specific tags from blkid.

Otherwise blkid can emit tags like SEC_TYPE which mess with the value
extraction code.

Bug: 23069906
Change-Id: Id2a588ff43a538747d1e44cd8218c96ebd0192c2

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 06222c3..e19c9df 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -170,6 +170,12 @@
     cmd.push_back(kBlkidPath);
     cmd.push_back("-c");
     cmd.push_back("/dev/null");
+    cmd.push_back("-s");
+    cmd.push_back("TYPE");
+    cmd.push_back("-s");
+    cmd.push_back("UUID");
+    cmd.push_back("-s");
+    cmd.push_back("LABEL");
     cmd.push_back(path);
 
     std::vector<std::string> output;