Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38ff8081 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "fs_mgr: Fix kernel command line parsing"

parents 1baa19b1 23249c9f

fs_mgr/fs_mgr_boot_config.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,9 @@ bool fs_mgr_get_boot_config_from_kernel(const std::string& cmdline, const std::s 
bool fs_mgr_get_boot_config_from_kernel_cmdline(const std::string& key, std::string* out_val) {

bool fs_mgr_get_boot_config_from_kernel_cmdline(const std::string& key, std::string* out_val) {

    std::string cmdline;

    std::string cmdline;

    if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) return false;

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

    return fs_mgr_get_boot_config_from_kernel(cmdline, key, out_val);

}

}