diff options
| author | David Anderson <dvander@google.com> | 2018-11-21 13:43:22 -0800 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2018-12-17 13:15:05 -0800 |
| commit | a5db1d72cf2f97053f3a3baef0be62c92a6baace (patch) | |
| tree | 79161d7a007402e04009a58fa5e5f0d44e1dbf68 /adb/client/commandline.cpp | |
| parent | 17d41711c62cb677740475946019c4038224e6f6 (diff) | |
| download | system_core-a5db1d72cf2f97053f3a3baef0be62c92a6baace.tar.gz system_core-a5db1d72cf2f97053f3a3baef0be62c92a6baace.tar.bz2 system_core-a5db1d72cf2f97053f3a3baef0be62c92a6baace.zip | |
adbd: Automatically disable verity in adb remount.
Before overlayfs, we supported deduplicated filesystems by undoing
deduplication in recovery. This required an extra reboot cycle, so we
changed "adb remount" to disable verity and boot to recovery in one
command.
After overlayfs, adb remount is still trying to undo deduplication,
which leads to very confusing messages. This patch makes things a bit
clearer. "adb remount" will disable verity, which installs overlayfs.
"adb remount -R" will do the same except automatically reboot.
Bug: N/A
Test: adb remount on dynamic partitions device
Change-Id: Id72f6b9e2297c2f4d5722d5679f6264fe660e631
Diffstat (limited to 'adb/client/commandline.cpp')
| -rw-r--r-- | adb/client/commandline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp index 867621414..cd9831bcf 100644 --- a/adb/client/commandline.cpp +++ b/adb/client/commandline.cpp @@ -192,7 +192,9 @@ static void help() { " get-state print offline | bootloader | device\n" " get-serialno print <serial-number>\n" " get-devpath print <device-path>\n" - " remount remount partitions read-write\n" + " remount [-R]\n" + " remount partitions read-write. if a reboot is required, -R will\n" + " will automatically reboot the device.\n" " reboot [bootloader|recovery|sideload|sideload-auto-reboot]\n" " reboot the device; defaults to booting system image but\n" " supports bootloader and recovery too. sideload reboots\n" |