commit d0fb412e4b3125eaa0d84bd9a42af5868838db83
author Tom Cherry <tomcherry@google.com> Wed Dec 19 15:27:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 15:27:03 2018 -0800
tree 6c42429629173a993360b845a57a5a8a00ed39fd
parent 8384e3ee9bbe411f0bc6b866aff99729ec46d174
parent 5ed1da3ca5247b3e45ab9aa286f2a68609ec85a8

Merge "fs_mgr: Fix kernel command line parsing" am: 38ff80810a am: 84d0fc3e4b
am: f9694102f8

Change-Id: I1c2d70d7db1ef74db40e379966b393f15a56022c

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);
 }