summaryrefslogtreecommitdiffstats
path: root/roots.h
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-08-01 17:47:48 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-01 17:47:48 +0200
commit414c576cf8fb5a8defef40d72f6c75012acdecab (patch)
treec5b20159f20aa9b15b40b90291164dde137e693d /roots.h
parentam 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." (diff)
parentam 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." (diff)
downloadandroid_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar.gz
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar.bz2
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar.lz
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar.xz
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.tar.zst
android_bootable_recovery-414c576cf8fb5a8defef40d72f6c75012acdecab.zip
Diffstat (limited to 'roots.h')
-rw-r--r--roots.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/roots.h b/roots.h
index 230d9ded3..6e3b24355 100644
--- a/roots.h
+++ b/roots.h
@@ -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_