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

Commit 36810d22 authored by Thomas Wendt's avatar Thomas Wendt Committed by Matt Mower
Browse files

Tell vold to use the fstype defined in fstab when formatting 

If, for whatever reason, a voldmanaged volume had a different filesystem
than the one defined in the fstab, then this filesystem was kept when
formatting. Change the logic to use the filesystem defined in the fstab when
available.

Change-Id: Iffbb5dc42838c1585c21f3ffa66b16921a16abd5
parent 9678ca2a

roots.c

+7 −1
Original line number Diff line number Diff line
@@ -388,7 +388,13 @@ int format_volume(const char* volume) { 
        if (ensure_path_unmounted(volume) != 0) {

            LOGE("format_volume failed to unmount %s", v->mount_point);

        }

        if (strcmp(v->fs_type, "auto") == 0) {

            // Format with current filesystem

            return vold_format_volume(v->mount_point, 1) == CommandOkay ? 0 : -1;

        } else {

            // Format filesystem defined in fstab

            return vold_custom_format_volume(v->mount_point, v->fs_type, 1) == CommandOkay ? 0 : -1;

        }

    }



    if (strcmp(v->fs_type, "ramdisk") == 0) {