aboutsummaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2015-03-30 20:56:57 +0000
committerAndres Morales <anmorales@google.com>2015-04-01 22:43:35 +0000
commitc94fa0b01b43709531dfbcdb94abb2a1cc23be3d (patch)
tree4fe170dd5cbb6a0f3b61576538e301d9d7c1bfff /roots.cpp
parent18f371d814b26132aadf11de6cc305f02484535a (diff)
downloadbootable_recovery-c94fa0b01b43709531dfbcdb94abb2a1cc23be3d.zip
bootable_recovery-c94fa0b01b43709531dfbcdb94abb2a1cc23be3d.tar.gz
bootable_recovery-c94fa0b01b43709531dfbcdb94abb2a1cc23be3d.tar.bz2
DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
This now gets done at the framework level. Doing it here breaks the signature on the partition. This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d. Bug: 19967123 Change-Id: I447b926b733ca145f11a916d9569ce39889db627
Diffstat (limited to 'roots.cpp')
-rw-r--r--roots.cpp37
1 files changed, 0 insertions, 37 deletions
diff --git a/roots.cpp b/roots.cpp
index 0d47577..ee14016 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -39,8 +39,6 @@ static struct fstab *fstab = NULL;
extern struct selabel_handle *sehandle;
-static const char* PERSISTENT_PATH = "/persistent";
-
void load_volume_table()
{
int i;
@@ -266,41 +264,6 @@ int format_volume(const char* volume) {
return -1;
}
-int erase_persistent_partition() {
- Volume *v = volume_for_path(PERSISTENT_PATH);
- if (v == NULL) {
- // most devices won't have /persistent, so this is not an error.
- return 0;
- }
-
- int fd = open(v->blk_device, O_RDWR);
- uint64_t size = get_file_size(fd);
- if (size == 0) {
- LOGE("failed to stat size of /persistent\n");
- close(fd);
- return -1;
- }
-
- char oem_unlock_enabled;
- lseek(fd, size - 1, SEEK_SET);
- read(fd, &oem_unlock_enabled, 1);
-
- if (oem_unlock_enabled) {
- if (wipe_block_device(fd, size)) {
- LOGE("error wiping /persistent: %s\n", strerror(errno));
- close(fd);
- return -1;
- }
-
- lseek(fd, size - 1, SEEK_SET);
- write(fd, &oem_unlock_enabled, 1);
- }
-
- close(fd);
-
- return (int) oem_unlock_enabled;
-}
-
int setup_install_mounts() {
if (fstab == NULL) {
LOGE("can't set up install mounts: no fstab loaded\n");