summaryrefslogtreecommitdiffstats
path: root/vold
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-07-06 12:43:21 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-06 12:43:21 -0700
commit192d1d79f72abb638495f51f8bbfba6ed8b013a8 (patch)
treea06c64a6b9067b76a25b8e97d451430b99db972d /vold
parent151047a8003fb69077c8900f2cc4b6b9376ee04b (diff)
parentb3edd0720ea26ef02763e7446d1bafb85546b38e (diff)
downloadcore-192d1d79f72abb638495f51f8bbfba6ed8b013a8.tar.gz
core-192d1d79f72abb638495f51f8bbfba6ed8b013a8.tar.bz2
core-192d1d79f72abb638495f51f8bbfba6ed8b013a8.zip
am b3edd072: vold: Change the disk formatter we use + fix commandline argument creation
Merge commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e' * commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e': vold: Change the disk formatter we use + fix commandline argument creation
Diffstat (limited to 'vold')
-rwxr-xr-xvold/format.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/vold/format.c b/vold/format.c
index d4e2327bf..cd401972f 100755
--- a/vold/format.c
+++ b/vold/format.c
@@ -26,7 +26,7 @@
#include "diskmbr.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";
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);
if (!strcmp(type, FORMAT_TYPE_FAT32)) {
- char *args[6];
+ char *args[9];
args[0] = MKDOSFS_PATH;
- args[1] = "-F 32";
- args[2] = "-c 32";
- args[3] = "-n 2";
- args[4] = "-O android";
- args[5] = devpath;
- args[6] = NULL;
- rc = logwrap(6, args, 1);
+ args[1] = "-F";
+ args[2] = "32";
+ args[3] = "-c";
+ args[4] = "16";
+ args[5] = "-O";
+ args[6] = "android";
+ args[7] = devpath;
+ args[8] = NULL;
+ rc = logwrap(8, args, 1);
} else {
char *args[7];
args[0] = MKE2FS_PATH;