PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create convert_fbe breadcrumb file to support conversion to FBE

Browse Source 
Change-Id: I38b29e1e34ea793e4b87cd27a1d39fa905fddf7a
This commit is contained in:
Paul Lawrence
2015-11-05 13:38:40 -08:00
parent 8b5f9d74a0
commit d0db337d72
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+6 -2
View File
@@ -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");