tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "recovery: Skip "/" in setup_install_mounts()."

Browse source 
am: d7446c8eed

Change-Id: I93411025025393abe819ff109ce7e00565281d88
This commit is contained in:
Tao Bao 2017-05-11 04:37:13 +00:00 committed by android-build-merger
commit b0626221a1
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
roots.cpp
View file

@ -260,26 +260,29 @@ int format_volume(const char* volume) {
}
int setup_install_mounts() {
if (fstab == NULL) {
LOG(ERROR) << "can't set up install mounts: no fstab loaded";
if (fstab == nullptr) {
LOG(ERROR) << "can't set up install mounts: no fstab loaded";
return -1;
}
for (int i = 0; i < fstab->num_entries; ++i) {
const Volume* v = fstab->recs + i;
// We don't want to do anything with "/".
if (strcmp(v->mount_point, "/") == 0) {
continue;
}
if (strcmp(v->mount_point, "/tmp") == 0 || strcmp(v->mount_point, "/cache") == 0) {
if (ensure_path_mounted(v->mount_point) != 0) {
LOG(ERROR) << "failed to mount " << v->mount_point;
return -1;
}
} else {
if (ensure_path_unmounted(v->mount_point) != 0) {
LOG(ERROR) << "failed to unmount " << v->mount_point;
return -1;
}
}
for (int i = 0; i < fstab->num_entries; ++i) {
Volume* v = fstab->recs + i;
if (strcmp(v->mount_point, "/tmp") == 0 ||
strcmp(v->mount_point, "/cache") == 0) {
if (ensure_path_mounted(v->mount_point) != 0) {
LOG(ERROR) << "failed to mount " << v->mount_point;
return -1;
}
} else {
if (ensure_path_unmounted(v->mount_point) != 0) {
LOG(ERROR) << "failed to unmount " << v->mount_point;
return -1;
}
}
}
return 0;
}
return 0;
}