commit 71a17ff717307e93a0400bc3cdde33050e08dfa7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 01 21:06:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 01 21:06:44 2021 +0000
tree bfa3fa840452ec66e64c48ab1ec36f05e9dbe51d
parent 75a2bba1587ed4935aa5af4455dce99b31d21f6a
parent dae48ef41ef62fd0b416123995a6bc7eea4f3761

Merge "fastboot: Bring back legacy A/B support"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f7edf8e..38be934 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1103,6 +1103,7 @@
 static std::string get_current_slot() {
     std::string current_slot;
     if (fb->GetVar("current-slot", &current_slot) != fastboot::SUCCESS) return "";
+    if (current_slot[0] == '_') current_slot.erase(0, 1);
     return current_slot;
 }
 
@@ -1950,6 +1951,7 @@
             if (slot_override == "") {
                 std::string current_slot;
                 if (fb->GetVar("current-slot", &current_slot) == fastboot::SUCCESS) {
+                    if (current_slot[0] == '_') current_slot.erase(0, 1);
                     next_active = verify_slot(current_slot, false);
                 } else {
                     wants_set_active = false;