commit f4a3153ed7bd33d02b5500b64e01916103bd9031
author Tom Cherry <tomcherry@google.com> Wed Dec 19 21:28:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 19 21:28:35 2018 +0000
tree 7a87e51fa7ba8c6f4d437c6c966d458587eb3aac
parent 7f2a852c152563264d6991dbf549b2e8f6ebd653
parent bc2e2b128df91c3ff72d1a71fd2a1c0cd859d834

Merge "fs_mgr: Fix kernel command line parsing"

fs_mgr/fs_mgr_boot_config.cpp

diff --git a/fs_mgr/fs_mgr_boot_config.cpp b/fs_mgr/fs_mgr_boot_config.cpp
index 733ad55..abece4d 100644
--- a/fs_mgr/fs_mgr_boot_config.cpp
+++ b/fs_mgr/fs_mgr_boot_config.cpp
@@ -81,6 +81,9 @@
 bool fs_mgr_get_boot_config_from_kernel_cmdline(const std::string& key, std::string* out_val) {
     std::string cmdline;
     if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) return false;
+    if (!cmdline.empty() && cmdline.back() == '\n') {
+        cmdline.pop_back();
+    }
     return fs_mgr_get_boot_config_from_kernel(cmdline, key, out_val);
 }