summaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-11-13 18:25:09 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-13 18:25:09 +0100
commitfd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3 (patch)
tree91a8d5933cc57dd34e92d913dfc261ed3d1855b4 /roots.cpp
parentMerge "We can use fclose directly in std::unique_ptr." (diff)
parentCreate convert_fbe breadcrumb file to support conversion to FBE (diff)
downloadandroid_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar.gz
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar.bz2
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar.lz
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar.xz
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.tar.zst
android_bootable_recovery-fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3.zip
Diffstat (limited to 'roots.cpp')
-rw-r--r--roots.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/roots.cpp b/roots.cpp
index 12c6b5ee2..f361cb8ca 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -175,7 +175,7 @@ static int exec_cmd(const char* path, char* const argv[]) {
return WEXITSTATUS(status);
}
-int format_volume(const char* volume) {
+int format_volume(const char* volume, const char* directory) {
Volume* v = volume_for_path(volume);
if (v == NULL) {
LOGE("unknown volume \"%s\"\n", volume);
@@ -241,7 +241,7 @@ int format_volume(const char* volume) {
}
int result;
if (strcmp(v->fs_type, "ext4") == 0) {
- result = make_ext4fs(v->blk_device, length, volume, sehandle);
+ result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);
} else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
LOGE("format_volume: crypt footer + negative length (%zd) not supported on %s\n", length, v->fs_type);
@@ -273,6 +273,10 @@ int format_volume(const char* volume) {
return -1;
}
+int format_volume(const char* volume) {
+ return format_volume(volume, NULL);
+}
+
int setup_install_mounts() {
if (fstab == NULL) {
LOGE("can't set up install mounts: no fstab loaded\n");