diff options
author | Tao Bao <tbao@google.com> | 2015-07-31 18:49:33 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 18:49:33 +0200 |
commit | 2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd (patch) | |
tree | 6aff8d34f5ec911e7621772adc6c76ed89d162f6 /roots.h | |
parent | am 62e19231: Merge "updater: Hoist fsync() to outer loop." (diff) | |
parent | Merge "recovery: Allow "Mount /system" for system_root_image." (diff) | |
download | android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar.gz android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar.bz2 android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar.lz android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar.xz android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.tar.zst android_bootable_recovery-2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd.zip |
Diffstat (limited to 'roots.h')
-rw-r--r-- | roots.h | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -19,10 +19,6 @@ #include "common.h" -#ifdef __cplusplus -extern "C" { -#endif - // Load and parse volume data from /etc/recovery.fstab. void load_volume_table(); @@ -33,7 +29,10 @@ Volume* volume_for_path(const char* path); // success (volume is mounted). int ensure_path_mounted(const char* path); -// Make sure that the volume 'path' is on is mounted. Returns 0 on +// Similar to ensure_path_mounted, but allows one to specify the mount_point. +int ensure_path_mounted_at(const char* path, const char* mount_point); + +// Make sure that the volume 'path' is on is unmounted. Returns 0 on // success (volume is unmounted); int ensure_path_unmounted(const char* path); @@ -46,8 +45,4 @@ int format_volume(const char* volume); // mounted (/tmp and /cache) are mounted. Returns 0 on success. int setup_install_mounts(); -#ifdef __cplusplus -} -#endif - #endif // RECOVERY_ROOTS_H_ |