diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-06-11 16:09:07 -0700 |
|---|---|---|
| committer | Tianjie Xu <xunchang@google.com> | 2019-06-20 13:53:40 -0700 |
| commit | f6158eb918fb86f94e418244a9351379ad568563 (patch) | |
| tree | bddde0da3fd2d6852f84e61887a69f8297fc1c2b /recovery.cpp | |
| parent | 87e22759704b58b41db224696362ebe10e140ea0 (diff) | |
Support starting fuse from a block map
Factor out a new function from ApplyFromSdcard that installs a package
from a local path. Inside this function, we start the fuse and choose the
type of data provider depending on the path string. And similar to the
existing logic, we treat the package as a block map if the path starts
with a '@'.
This is part of the effort to install larger than 2GiB packages on ILP32
devices.
Bug: 127071893
Test: Build a 32 bit sailfish and create a 3GiB OTA package. Sideload
the package, uncrypt and install the package from sdcard.
Change-Id: I328ea34fa530731acbce7554bfc3059313ad6ece
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index db66ea7e..b18a8e74 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -49,7 +49,7 @@ #include "common.h" #include "fsck_unshare_blocks.h" #include "install/adb_install.h" -#include "install/fuse_sdcard_install.h" +#include "install/fuse_install.h" #include "install/install.h" #include "install/package.h" #include "install/wipe_data.h" @@ -408,7 +408,7 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status) status = ApplyFromAdb(device, false /* rescue_mode */, &reboot_action); } else { adb = false; - status = ApplyFromSdcard(device, ui); + status = ApplyFromSdcard(device); } ui->Print("\nInstall from %s completed with status %d.\n", adb ? "ADB" : "SD card", status); |