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

Commit d28f4577 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Remove check that only allows microdroid vendor partition on debuggable VMs 

The microdroid vendor partition is now verified during Microdroid boot,
so no need for this check.

Bug: 287593065
Test: AVF presubmit
Change-Id: I84811f818ef1140f1fe93d9da5f9ee61341e75dd
parent ad55fad0

init/first_stage_init.cpp

+0 −12
Original line number Diff line number Diff line
@@ -408,18 +408,6 @@ int FirstStageMain(int argc, char** argv) { 


    LOG(INFO) << "init first stage started!";



    // We only allow /vendor partition in debuggable Microdrod until it is verified during boot.

    // TODO(b/285855436): remove this check.

    if (IsMicrodroid()) {

        bool mount_vendor =

                cmdline.find("androidboot.microdroid.mount_vendor=1") != std::string::npos;

        bool debuggable =

                bootconfig.find("androidboot.microdroid.debuggable = \"1\"") != std::string::npos;

        if (mount_vendor && !debuggable) {

            LOG(FATAL) << "Attempted to mount /vendor partition for non-debuggable Microdroid VM";

        }

    }



    auto old_root_dir = std::unique_ptr<DIR, decltype(&closedir)>{opendir("/"), closedir};

    if (!old_root_dir) {

        PLOG(ERROR) << "Could not opendir(\"/\"), not freeing ramdisk";