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

Commit 192d1d79 authored by San Mehat's avatar San Mehat Committed by The Android Open Source Project
Browse files

am b3edd072: vold: Change the disk formatter we use + fix commandline argument creation 

Merge commit 'b3edd072'

* commit 'b3edd072':
  vold: Change the disk formatter we use + fix commandline argument creation
parents 151047a8 b3edd072

vold/format.c

+11 −9
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "diskmbr.h"

#include "diskmbr.h"

#include "logwrapper.h"

#include "logwrapper.h"





static char MKDOSFS_PATH[] = "/system/bin/mkdosfs";

static char MKDOSFS_PATH[] = "/system/bin/newfs_msdos";

static char MKE2FS_PATH[] = "/system/bin/mke2fs";

static char MKE2FS_PATH[] = "/system/bin/mke2fs";





int format_partition(blkdev_t *part, char *type)

int format_partition(blkdev_t *part, char *type)
@@ -37,15 +37,17 @@ int format_partition(blkdev_t *part, char *type) 
    devpath = blkdev_get_devpath(part);

    devpath = blkdev_get_devpath(part);





    if (!strcmp(type, FORMAT_TYPE_FAT32)) {

    if (!strcmp(type, FORMAT_TYPE_FAT32)) {

        char *args[6];

        char *args[9];

        args[0] = MKDOSFS_PATH;

        args[0] = MKDOSFS_PATH;

        args[1] = "-F 32";

        args[1] = "-F";

        args[2] = "-c 32";

        args[2] = "32";

        args[3] = "-n 2";

        args[3] = "-c";

        args[4] = "-O android";

        args[4] = "16";

        args[5] = devpath;

        args[5] = "-O";

        args[6] = NULL;

        args[6] = "android";

        rc = logwrap(6, args, 1);

        args[7] = devpath;

        args[8] = NULL;

        rc = logwrap(8, args, 1);

    } else {

    } else {

        char *args[7];

        char *args[7];

        args[0] = MKE2FS_PATH;

        args[0] = MKE2FS_PATH;