diff options
author | Paul Lawrence <paullawrence@google.com> | 2015-11-05 22:38:40 +0100 |
---|---|---|
committer | Paul Lawrence <paullawrence@google.com> | 2015-11-13 16:49:31 +0100 |
commit | d0db337d727707977fa562bcc492b27270e67937 (patch) | |
tree | ce8ca7e2cf3ae6ace1a36120ed25bc9f67672852 /roots.cpp | |
parent | Merge "uncrypt: remove O_SYNC to avoid time-out failures" (diff) | |
download | android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar.gz android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar.bz2 android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar.lz android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar.xz android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.tar.zst android_bootable_recovery-d0db337d727707977fa562bcc492b27270e67937.zip |
Diffstat (limited to '')
-rw-r--r-- | roots.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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"); |