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

Commit 4f00cdb9 authored by Tom Marshall's avatar Tom Marshall Committed by Michael Bestas
Browse files

Revert "Format formattable partitions if mount fails" 

This reverts commit 29dd6b6c01295222fee5ef2fc70692b2ecb12504.

Change-Id: I7b76cd920019ae8cb7270b3f83e777ea9de7f7a4
parent a2e2a2b3

fs_mgr/fs_mgr_roots.cpp

+0 −9
Original line number Diff line number Diff line
@@ -118,15 +118,6 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& 
    }



    int result = fs_mgr_do_mount_one(*rec, mount_point);

    if (result == -1 && rec->fs_mgr_flags.formattable) {

        PERROR << "Failed to mount " << mount_point << "; formatting";

        bool crypt_footer = rec->is_encryptable() && rec->key_loc == "footer";

        if (fs_mgr_do_format(*rec, crypt_footer) != 0) {

            PERROR << "Failed to format " << mount_point;

            return false;

        }

        result = fs_mgr_do_mount_one(*rec, mount_point);

    }



    if (result == -1) {

        PERROR << "Failed to mount " << mount_point;