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

Commit ba2449b6 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_mgr: remount: add -v option 



By default print only ERROR message, or messages without a source
(eg: [fs_mgr]) library.  Print all messages to stderr if the -v
option is added.  Always log all messages to the Android logger.

Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Test: adb-remount-test.sh
Change-Id: I131315d4bae6ed29991043033811cf22e6032f8b
parent fd8b4ea9

fs_mgr/fs_mgr_remount.cpp

+13 −5
Original line number Diff line number Diff line
@@ -80,9 +80,13 @@ const android::fs_mgr::FstabEntry* is_wrapped(const android::fs_mgr::Fstab& over 
    return &(*it);

}



auto verbose = false;



void MyLogger(android::base::LogId id, android::base::LogSeverity severity, const char* tag,

              const char* file, unsigned int line, const char* message) {

    if (verbose || severity == android::base::ERROR || message[0] != '[') {

        fprintf(stderr, "%s\n", message);

    }

    static auto logd = android::base::LogdLogger();

    logd(id, severity, tag, file, line, message);

}
@@ -131,10 +135,14 @@ static int do_remount(int argc, char* argv[]) { 
            {"fstab", required_argument, nullptr, 'T'},

            {"help", no_argument, nullptr, 'h'},

            {"reboot", no_argument, nullptr, 'R'},

            {"verbose", no_argument, nullptr, 'v'},

            {0, 0, nullptr, 0},

    };

    for (int opt; (opt = ::getopt_long(argc, argv, "hRT:", longopts, nullptr)) != -1;) {

    for (int opt; (opt = ::getopt_long(argc, argv, "hRT:v", longopts, nullptr)) != -1;) {

        switch (opt) {

            case 'h':

                usage(SUCCESS);

                break;

            case 'R':

                can_reboot = true;

                break;
@@ -145,13 +153,13 @@ static int do_remount(int argc, char* argv[]) { 
                }

                fstab_file = optarg;

                break;

            case 'v':

                verbose = true;

                break;

            default:

                LOG(ERROR) << "Bad Argument -" << char(opt);

                usage(BADARG);

                break;

            case 'h':

                usage(SUCCESS);

                break;

        }

    }