commit 421b46e0cb301019563c7ba1c797aa752fc318df
author Ying Wang <wangying@google.com> Tue Sep 28 10:45:54 2010 -0700
committer Ying Wang <wangying@google.com> Tue Sep 28 10:45:54 2010 -0700
tree 38530ce68abca3b7531f4030d0b14e92de74ef4f
parent e54320d75998cbec4391be2b04c61164fa2d70fd
parent 18c00c5c6abc9a3d781995ddd0225c7488f14ef4

resolved conflicts for merge of 18c00c5c to master

Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2

tools/releasetools/img_from_target_files

diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files
index ef0f24c..488226f 100755
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -65,7 +65,7 @@
   if fstab and fstab["/data"].fs_type.startswith("ext"):
     build_command = ["mkuserimg.sh",
                      user_dir, img.name,
-                     fstab["/data"].fs_type, "userdata"]
+                     fstab["/data"].fs_type, "data"]
     if "userdata_size" in OPTIONS.info_dict:
       build_command.append(str(OPTIONS.info_dict["userdata_size"]))
   else: