OSDN Git Service
(root)
/
android-x86
/
system-vold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1bd078f
)
Request specific tags from blkid.
author
Jeff Sharkey
<jsharkey@android.com>
Wed, 12 Aug 2015 23:04:35 +0000
(16:04 -0700)
committer
Jeff Sharkey
<jsharkey@android.com>
Wed, 12 Aug 2015 23:04:52 +0000
(16:04 -0700)
Otherwise blkid can emit tags like SEC_TYPE which mess with the value
extraction code.
Bug:
23069906
Change-Id: Id2a588ff43a538747d1e44cd8218c96ebd0192c2
Utils.cpp
patch
|
blob
|
history
diff --git
a/Utils.cpp
b/Utils.cpp
index
06222c3
..
e19c9df
100644
(file)
--- 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;