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

Commit 660bacb2 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Automerger Merge Worker
Browse files

Merge changes I1ecdffcb,Ib0d1ea81 into main am: 4ae617f6 am: cab03711 am: 40b73973 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2837188



Change-Id: If27a82e0a522d0b4fcd588ea8f05cd9bde7735c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a28acbe 40b73973

fs_mgr/fs_mgr_format.cpp

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static int format_f2fs(const std::string& fs_blkdev, uint64_t dev_sz, bool needs 
    /* Format the partition using the calculated length */



    const auto size_str = std::to_string(dev_sz / getpagesize());

    std::string block_size = std::to_string(getpagesize());



    std::vector<const char*> args = {"/system/bin/make_f2fs", "-g", "android"};

    if (needs_projid) {
@@ -154,6 +155,10 @@ static int format_f2fs(const std::string& fs_blkdev, uint64_t dev_sz, bool needs 
        args.push_back("-O");

        args.push_back("extra_attr");

    }

    args.push_back("-w");

    args.push_back(block_size.c_str());

    args.push_back("-b");

    args.push_back(block_size.c_str());

    if (!zoned_device.empty()) {

        args.push_back("-c");

        args.push_back(zoned_device.c_str());

fs_mgr/fs_mgr_overlayfs_control.cpp

+2 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ bool MakeScratchFilesystem(const std::string& scratch_device) { 
        fs_type = "f2fs";

        command = kMkF2fs + " -w "s;

        command += std::to_string(getpagesize());

        command = kMkF2fs + " -b "s;

        command += std::to_string(getpagesize());

        command += " -f -d1 -l" + android::base::Basename(kScratchMountPoint);

    } else if (!access(kMkExt4, X_OK) && fs_mgr_filesystem_available("ext4")) {

        fs_type = "ext4";