From eddf9bd63c1f7e0f9709f7c58a1035fa43338325 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 12 Aug 2015 16:04:35 -0700
Subject: [PATCH] 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Utils.cpp b/Utils.cpp
index 06222c3..e19c9df 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -170,6 +170,12 @@ static status_t readMetadata(const std::string& path, std::string& fsType,
     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;