diff options
author | Doug Zongker <dougz@android.com> | 2010-07-09 02:50:26 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 02:50:26 +0200 |
commit | c02c37a1e6bd67198a6522461b81c9cdd125625e (patch) | |
tree | 3d189beaa3ce60b54b20d66876cd52b69a7a3202 /roots.c | |
parent | merge from open-source master (diff) | |
parent | make a copy of sideloaded packages in /tmp before verifying (diff) | |
download | android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar.gz android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar.bz2 android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar.lz android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar.xz android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.tar.zst android_bootable_recovery-c02c37a1e6bd67198a6522461b81c9cdd125625e.zip |
Diffstat (limited to '')
-rw-r--r-- | roots.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -42,6 +42,7 @@ xxx may just want to use enums static const char g_mtd_device[] = "@\0g_mtd_device"; static const char g_raw[] = "@\0g_raw"; static const char g_package_file[] = "@\0g_package_file"; +static const char g_ramdisk[] = "@\0g_ramdisk"; static RootInfo g_roots[] = { { "BOOT:", g_mtd_device, NULL, "boot", NULL, g_raw }, @@ -53,7 +54,7 @@ static RootInfo g_roots[] = { { "SDCARD:", "/dev/block/mmcblk0p1", "/dev/block/mmcblk0", NULL, "/sdcard", "vfat" }, { "SYSTEM:", g_mtd_device, NULL, "system", "/system", "yaffs2" }, { "MBM:", g_mtd_device, NULL, "mbm", NULL, g_raw }, - { "TMP:", NULL, NULL, NULL, "/tmp", NULL }, + { "TMP:", NULL, NULL, NULL, "/tmp", g_ramdisk }, }; #define NUM_ROOTS (sizeof(g_roots) / sizeof(g_roots[0])) @@ -180,7 +181,9 @@ internal_root_mounted(const RootInfo *info) if (info->mount_point == NULL) { return -1; } -//xxx if TMP: (or similar) just say "yes" + if (info->filesystem == g_ramdisk) { + return 0; + } /* See if this root is already mounted. */ |