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

Commit 7f90296c authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Merge "Fixed failure of clearing loopback device" into main

parents c81f2e81 b2a64ccf

init/reboot.cpp

+7 −2
Original line number Diff line number Diff line
@@ -486,8 +486,7 @@ static Result<void> KillZramBackingDevice() { 
        return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;

    }



    // cut the last "\n"

    backing_dev.erase(backing_dev.length() - 1);

    android::base::Trim(backing_dev);



    if (android::base::StartsWith(backing_dev, "none")) {

        LOG(INFO) << "No zram backing device configured";
@@ -508,6 +507,12 @@ static Result<void> KillZramBackingDevice() { 
                       << " failed";

    }



    if (!android::base::ReadFileToString(ZRAM_BACK_DEV, &backing_dev)) {

        return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;

    }



    android::base::Trim(backing_dev);



    if (!android::base::StartsWith(backing_dev, "/dev/block/loop")) {

        LOG(INFO) << backing_dev << " is not a loop device. Exiting early";

        return {};