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

Commit f32bc7cd authored by Haoyu Tang's avatar Haoyu Tang Committed by Xihua Chen
Browse files

init: remove the restriction of arguments 



X86 Kernel could pass CPU capablity to init as argument. This will cause init
can't start first-stage because unknown argument. Need remove this restriction
of arguments to start init successfully.

Fixes: 122435289
Test: Android init can start successfully

Change-Id: I1d432e25553589dd7f618e42ad238b9372dbe34f
Signed-off-by: default avatarHaoyu Tang <haoyu.tang@intel.com>
Signed-off-by: default avatarXihua Chen <xihua.chen@intel.com>
parent c2aad281

init/main.cpp

+13 −18
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ int main(int argc, char** argv) { 
        return ueventd_main(argc, argv);

    }



    if (argc < 2) {

        return FirstStageMain(argc, argv);

    }



    if (argc > 1) {

        if (!strcmp(argv[1], "subcontext")) {

            android::base::InitLogging(argv, &android::base::KernelLogger);

            const BuiltinFunctionMap function_map;
@@ -75,9 +72,7 @@ int main(int argc, char** argv) { 
        if (!strcmp(argv[1], "second_stage")) {

            return SecondStageMain(argc, argv);

        }

    }



    android::base::InitLogging(argv, &android::base::KernelLogger);



    LOG(ERROR) << "Unknown argument passed to init '" << argv[1] << "'";

    return 1;

    return FirstStageMain(argc, argv);

}