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

Commit 64e92f94 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

init: loading debug resources before chroot into first_stage_ramdisk 

Currently the debug resources might under /first_stage_ramdisk/*
of the ramdisk, if there is androidboot.force_normal_boot=1 in the
kernel cmdline to request init chroot into /first_stage_ramdisk dir.

To make a generic boot-debug.img works on devices with and without
this chroot, moving the debug resources to the root of the ramdisk.
And copy them for later use before the chroot.

Bug: 186082603
Test: boot a device with boot-debug.img
Test: boot a device with vendor_boot-debug.img
Change-Id: I052a92b2d26c7fdf749991fc55015ff68743efc2
parent 9596d062

init/first_stage_init.cpp

+13 −22
Original line number Original line Diff line number Diff line
@@ -327,6 +327,19 @@ int FirstStageMain(int argc, char** argv) { 
        LOG(INFO) << "Copied ramdisk prop to " << dest;

        LOG(INFO) << "Copied ramdisk prop to " << dest;

    }

    }





    // If "/force_debuggable" is present, the second-stage init will use a userdebug

    // sepolicy and load adb_debug.prop to allow adb root, if the device is unlocked.

    if (access("/force_debuggable", F_OK) == 0) {

        std::error_code ec;  // to invoke the overloaded copy_file() that won't throw.

        if (!fs::copy_file("/adb_debug.prop", kDebugRamdiskProp, ec) ||

            !fs::copy_file("/userdebug_plat_sepolicy.cil", kDebugRamdiskSEPolicy, ec)) {

            LOG(ERROR) << "Failed to setup debug ramdisk";

        } else {

            // setenv for second-stage init to read above kDebugRamdisk* files.

            setenv("INIT_FORCE_DEBUGGABLE", "true", 1);

        }

    }



    if (ForceNormalBoot(cmdline, bootconfig)) {

    if (ForceNormalBoot(cmdline, bootconfig)) {

        mkdir("/first_stage_ramdisk", 0755);

        mkdir("/first_stage_ramdisk", 0755);

        // SwitchRoot() must be called with a mount point as the target, so we bind mount the

        // SwitchRoot() must be called with a mount point as the target, so we bind mount the
@@ -337,28 +350,6 @@ int FirstStageMain(int argc, char** argv) { 
        SwitchRoot("/first_stage_ramdisk");

        SwitchRoot("/first_stage_ramdisk");

    }

    }





    std::string force_debuggable("/force_debuggable");

    std::string adb_debug_prop("/adb_debug.prop");

    std::string userdebug_sepolicy("/userdebug_plat_sepolicy.cil");

    if (IsRecoveryMode()) {

        // Update these file paths since we didn't switch root

        force_debuggable.insert(0, "/first_stage_ramdisk");

        adb_debug_prop.insert(0, "/first_stage_ramdisk");

        userdebug_sepolicy.insert(0, "/first_stage_ramdisk");

    }

    // If this file is present, the second-stage init will use a userdebug sepolicy

    // and load adb_debug.prop to allow adb root, if the device is unlocked.

    if (access(force_debuggable.c_str(), F_OK) == 0) {

        std::error_code ec;  // to invoke the overloaded copy_file() that won't throw.

        if (!fs::copy_file(adb_debug_prop, kDebugRamdiskProp, ec) ||

            !fs::copy_file(userdebug_sepolicy, kDebugRamdiskSEPolicy, ec)) {

            LOG(ERROR) << "Failed to setup debug ramdisk";

        } else {

            // setenv for second-stage init to read above kDebugRamdisk* files.

            setenv("INIT_FORCE_DEBUGGABLE", "true", 1);

        }

    }



    if (!DoFirstStageMount(!created_devices)) {

    if (!DoFirstStageMount(!created_devices)) {

        LOG(FATAL) << "Failed to mount required partitions early ...";

        LOG(FATAL) << "Failed to mount required partitions early ...";

    }

    }