From ab1f8b836e0a65235cb74168db5a83b2b6f74330 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 27 Feb 2011 17:28:30 -0800 Subject: [PATCH] more fixes for sammy Change-Id: Ie11c673a204a328a82f767a2610c5f1d9a51233c --- extendedcommands.c | 3 ++- roots.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/extendedcommands.c b/extendedcommands.c index 0a43770..97eda9a 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -977,7 +977,8 @@ void write_fstab_root(char *path, FILE *file) fprintf(file, "%s ", device); fprintf(file, "%s ", path); - fprintf(file, "%s rw\n", vol->fs_type2 != NULL ? "auto" : vol->fs_type); + // special case rfs cause auto will mount it as vfat on samsung. + fprintf(file, "%s rw\n", vol->fs_type2 != NULL && strcmp(vol->fs_type, "rfs") != 0 ? "auto" : vol->fs_type); } void create_fstab() diff --git a/roots.c b/roots.c index 8320061..818ed1c 100644 --- a/roots.c +++ b/roots.c @@ -175,6 +175,7 @@ int ensure_path_mounted(const char* path) { return mtd_mount_partition(partition, v->mount_point, v->fs_type, 0); } else if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "ext3") == 0 || + strcmp(v->fs_type, "rfs") == 0 || strcmp(v->fs_type, "vfat") == 0) { // try fs type 2 first if ((result = try_mount(v->device, v->mount_point, v->fs_type, v->fs_options)) == 0)